ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/JSON-XS/XS.xs
(Generate patch)

Comparing JSON-XS/XS.xs (file contents):
Revision 1.83 by root, Wed Mar 26 22:54:38 2008 UTC vs.
Revision 1.134 by root, Thu Nov 15 20:13:03 2018 UTC

… …
6#include <string.h> 6#include <string.h>
7#include <stdlib.h> 7#include <stdlib.h>
8#include <stdio.h> 8#include <stdio.h>
9#include <limits.h> 9#include <limits.h>
10#include <float.h> 10#include <float.h>
11#include <inttypes.h>
11 12
12#if defined(__BORLANDC__) || defined(_MSC_VER) 13#if defined(__BORLANDC__) || defined(_MSC_VER)
13# define snprintf _snprintf // C compilers have this in stdio.h 14# define snprintf _snprintf // C compilers have this in stdio.h
14#endif 15#endif
15 16
16// some old perls do not have this, try to make it work, no 17// some old perls do not have this, try to make it work, no
17// guarentees, though. if it breaks, you get to keep the pieces. 18// guarantees, though. if it breaks, you get to keep the pieces.
18#ifndef UTF8_MAXBYTES 19#ifndef UTF8_MAXBYTES
19# define UTF8_MAXBYTES 13 20# define UTF8_MAXBYTES 13
20#endif 21#endif
21 22
23// compatibility with perl <5.18
24#ifndef HvNAMELEN_get
25# define HvNAMELEN_get(hv) strlen (HvNAME (hv))
26#endif
27#ifndef HvNAMELEN
28# define HvNAMELEN(hv) HvNAMELEN_get (hv)
29#endif
30#ifndef HvNAMEUTF8
31# define HvNAMEUTF8(hv) 0
32#endif
33
34// three extra for rounding, sign, and end of string
22#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 2) 35#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3)
23 36
24#define F_ASCII 0x00000001UL 37#define F_ASCII 0x00000001UL
25#define F_LATIN1 0x00000002UL 38#define F_LATIN1 0x00000002UL
26#define F_UTF8 0x00000004UL 39#define F_UTF8 0x00000004UL
27#define F_INDENT 0x00000008UL 40#define F_INDENT 0x00000008UL
… …
31#define F_ALLOW_NONREF 0x00000100UL 44#define F_ALLOW_NONREF 0x00000100UL
32#define F_SHRINK 0x00000200UL 45#define F_SHRINK 0x00000200UL
33#define F_ALLOW_BLESSED 0x00000400UL 46#define F_ALLOW_BLESSED 0x00000400UL
34#define F_CONV_BLESSED 0x00000800UL 47#define F_CONV_BLESSED 0x00000800UL
35#define F_RELAXED 0x00001000UL 48#define F_RELAXED 0x00001000UL
36 49#define F_ALLOW_UNKNOWN 0x00002000UL
37#define F_MAXDEPTH 0xf8000000UL 50#define F_ALLOW_TAGS 0x00004000UL
38#define S_MAXDEPTH 27
39#define F_MAXSIZE 0x01f00000UL
40#define S_MAXSIZE 20
41#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing 51#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
42 52
43#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
44#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
45
46#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 53#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
47#define F_DEFAULT (9UL << S_MAXDEPTH)
48 54
49#define INIT_SIZE 32 // initial scalar size to be allocated 55#define INIT_SIZE 64 // initial scalar size to be allocated
50#define INDENT_STEP 3 // spaces per indentation level 56#define INDENT_STEP 3 // spaces per indentation level
51 57
52#define SHORT_STRING_LEN 16384 // special-case strings of up to this size 58#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
59
60#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8)
53 61
54#define SB do { 62#define SB do {
55#define SE } while (0) 63#define SE } while (0)
56 64
57#if __GNUC__ >= 3 65#if __GNUC__ >= 3
… …
67 75
68#define IN_RANGE_INC(type,val,beg,end) \ 76#define IN_RANGE_INC(type,val,beg,end) \
69 ((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \ 77 ((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \
70 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg))) 78 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
71 79
80#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"
81
72#ifdef USE_ITHREADS 82#ifdef USE_ITHREADS
73# define JSON_SLOW 1
74# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1)) 83# define JSON_STASH (expect_true (json_stash) ? json_stash : gv_stashpv ("JSON::XS", 1))
84# define BOOL_STASH (expect_true (bool_stash) ? bool_stash : gv_stashpv ("Types::Serialiser::Boolean", 1))
85# define GET_BOOL(value) (expect_true (bool_ ## value) ? bool_ ## value : get_bool ("Types::Serialiser::" # value))
75#else 86#else
76# define JSON_SLOW 0
77# define JSON_STASH json_stash 87# define JSON_STASH json_stash
88# define BOOL_STASH bool_stash
89# define GET_BOOL(value) bool_ ## value
78#endif 90#endif
79 91
80static HV *json_stash, *json_boolean_stash; // JSON::XS:: 92// the amount of HEs to allocate on the stack, when sorting keys
81static SV *json_true, *json_false; 93#define STACK_HES 64
94
95static HV *json_stash, *bool_stash; // JSON::XS::, Types::Serialiser::Boolean::
96static SV *bool_false, *bool_true;
97static SV *sv_json;
82 98
83enum { 99enum {
84 INCR_M_WS = 0, // initial whitespace skipping, must be 0 100 INCR_M_WS = 0, // initial whitespace skipping, must be 0
85 INCR_M_STR, // inside string 101 INCR_M_STR, // inside string
86 INCR_M_BS, // inside backslash 102 INCR_M_BS, // inside backslash
103 INCR_M_C0, // inside comment in initial whitespace sequence
104 INCR_M_C1, // inside comment in other places
87 INCR_M_JSON // outside anything, count nesting 105 INCR_M_JSON // outside anything, count nesting
88}; 106};
89 107
90#define INCR_DONE(json) (!(json)->incr_nest && (json)->incr_mode == INCR_M_JSON) 108#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
91 109
92typedef struct { 110typedef struct {
93 U32 flags; 111 U32 flags;
112 U32 max_depth;
113 STRLEN max_size;
114
94 SV *cb_object; 115 SV *cb_object;
95 HV *cb_sk_object; 116 HV *cb_sk_object;
96 117
97 // for the incremental parser 118 // for the incremental parser
98 SV *incr_text; // the source text so far 119 SV *incr_text; // the source text so far
99 STRLEN incr_pos; // the current offset into the text 120 STRLEN incr_pos; // the current offset into the text
100 int incr_nest; // {[]}-nesting level 121 int incr_nest; // {[]}-nesting level
101 int incr_mode; 122 unsigned char incr_mode;
123
124 SV *v_false, *v_true;
102} JSON; 125} JSON;
126
127INLINE void
128json_init (JSON *json)
129{
130 Zero (json, 1, JSON);
131 json->max_depth = 512;
132}
103 133
104///////////////////////////////////////////////////////////////////////////// 134/////////////////////////////////////////////////////////////////////////////
105// utility functions 135// utility functions
106 136
107INLINE SV * 137INLINE SV *
… …
117 147
118INLINE void 148INLINE void
119shrink (SV *sv) 149shrink (SV *sv)
120{ 150{
121 sv_utf8_downgrade (sv, 1); 151 sv_utf8_downgrade (sv, 1);
152
122 if (SvLEN (sv) > SvCUR (sv) + 1) 153 if (SvLEN (sv) > SvCUR (sv) + 1)
123 { 154 {
124#ifdef SvPV_shrink_to_cur 155#ifdef SvPV_shrink_to_cur
125 SvPV_shrink_to_cur (sv); 156 SvPV_shrink_to_cur (sv);
126#elif defined (SvPV_renew) 157#elif defined (SvPV_renew)
127 SvPV_renew (sv, SvCUR (sv) + 1); 158 SvPV_renew (sv, SvCUR (sv) + 1);
128#endif 159#endif
129 } 160 }
130} 161}
131 162
163/* adds two STRLENs together, slow, and with paranoia */
164STRLEN
165strlen_sum (STRLEN l1, STRLEN l2)
166{
167 size_t sum = l1 + l2;
168
169 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum)
170 croak ("JSON::XS: string size overflow");
171
172 return sum;
173}
174
175/* similar to SvGROW, but somewhat safer and guarantees exponential realloc strategy */
176static char *
177json_sv_grow (SV *sv, size_t len1, size_t len2)
178{
179 len1 = strlen_sum (len1, len2);
180 len1 = strlen_sum (len1, len1 >> 1);
181
182 if (len1 > 4096 - 24)
183 len1 = (len1 | 4095) - 24;
184
185 return SvGROW (sv, len1);
186}
187
132// decode an utf-8 character and return it, or (UV)-1 in 188// decode a utf-8 character and return it, or (UV)-1 in
133// case of an error. 189// case of an error.
134// we special-case "safe" characters from U+80 .. U+7FF, 190// we special-case "safe" characters from U+80 .. U+7FF,
135// but use the very good perl function to parse anything else. 191// but use the very good perl function to parse anything else.
136// note that we never call this function for a ascii codepoints 192// note that we never call this function for a ascii codepoints
137INLINE UV 193INLINE UV
… …
170 *s++ = 0x80 | ( ch & 0x3f); 226 *s++ = 0x80 | ( ch & 0x3f);
171 227
172 return s; 228 return s;
173} 229}
174 230
231// convert offset pointer to character index, sv must be string
232static STRLEN
233ptr_to_index (SV *sv, char *offset)
234{
235 return SvUTF8 (sv)
236 ? utf8_distance (offset, SvPVX (sv))
237 : offset - SvPVX (sv);
238}
239
240/////////////////////////////////////////////////////////////////////////////
241// fp hell
242
243// scan a group of digits, and a trailing exponent
244static void
245json_atof_scan1 (const char *s, NV *accum, int *expo, int postdp, int maxdepth)
246{
247 UV uaccum = 0;
248 int eaccum = 0;
249
250 // if we recurse too deep, skip all remaining digits
251 // to avoid a stack overflow attack
252 if (expect_false (--maxdepth <= 0))
253 while (((U8)*s - '0') < 10)
254 ++s;
255
256 for (;;)
257 {
258 U8 dig = (U8)*s - '0';
259
260 if (expect_false (dig >= 10))
261 {
262 if (dig == (U8)((U8)'.' - (U8)'0'))
263 {
264 ++s;
265 json_atof_scan1 (s, accum, expo, 1, maxdepth);
266 }
267 else if ((dig | ' ') == 'e' - '0')
268 {
269 int exp2 = 0;
270 int neg = 0;
271
272 ++s;
273
274 if (*s == '-')
275 {
276 ++s;
277 neg = 1;
278 }
279 else if (*s == '+')
280 ++s;
281
282 while ((dig = (U8)*s - '0') < 10)
283 exp2 = exp2 * 10 + *s++ - '0';
284
285 *expo += neg ? -exp2 : exp2;
286 }
287
288 break;
289 }
290
291 ++s;
292
293 uaccum = uaccum * 10 + dig;
294 ++eaccum;
295
296 // if we have too many digits, then recurse for more
297 // we actually do this for rather few digits
298 if (uaccum >= (UV_MAX - 9) / 10)
299 {
300 if (postdp) *expo -= eaccum;
301 json_atof_scan1 (s, accum, expo, postdp, maxdepth);
302 if (postdp) *expo += eaccum;
303
304 break;
305 }
306 }
307
308 // this relies greatly on the quality of the pow ()
309 // implementation of the platform, but a good
310 // implementation is hard to beat.
311 // (IEEE 754 conformant ones are required to be exact)
312 if (postdp) *expo -= eaccum;
313 *accum += uaccum * Perl_pow (10., *expo);
314 *expo += eaccum;
315}
316
317static NV
318json_atof (const char *s)
319{
320 NV accum = 0.;
321 int expo = 0;
322 int neg = 0;
323
324 if (*s == '-')
325 {
326 ++s;
327 neg = 1;
328 }
329
330 // a recursion depth of ten gives us >>500 bits
331 json_atof_scan1 (s, &accum, &expo, 0, 10);
332
333 return neg ? -accum : accum;
334}
335
336// target of scalar reference is bool? -1 == nope, 0 == false, 1 == true
337static int
338ref_bool_type (SV *sv)
339{
340 svtype svt = SvTYPE (sv);
341
342 if (svt < SVt_PVAV)
343 {
344 STRLEN len = 0;
345 char *pv = svt ? SvPV (sv, len) : 0;
346
347 if (len == 1)
348 if (*pv == '1')
349 return 1;
350 else if (*pv == '0')
351 return 0;
352 }
353
354 return -1;
355}
356
357// returns whether scalar is not a reference in the sense of allow_nonref
358static int
359json_nonref (SV *scalar)
360{
361 if (!SvROK (scalar))
362 return 1;
363
364 scalar = SvRV (scalar);
365
366 if (SvTYPE (scalar) >= SVt_PVMG)
367 {
368 if (SvSTASH (scalar) == bool_stash)
369 return 1;
370
371 if (!SvOBJECT (scalar) && ref_bool_type (scalar) >= 0)
372 return 1;
373 }
374
375 return 0;
376}
377
175///////////////////////////////////////////////////////////////////////////// 378/////////////////////////////////////////////////////////////////////////////
176// encoder 379// encoder
177 380
178// structure used for encoding JSON 381// structure used for encoding JSON
179typedef struct 382typedef struct
… …
181 char *cur; // SvPVX (sv) + current output position 384 char *cur; // SvPVX (sv) + current output position
182 char *end; // SvEND (sv) 385 char *end; // SvEND (sv)
183 SV *sv; // result scalar 386 SV *sv; // result scalar
184 JSON json; 387 JSON json;
185 U32 indent; // indentation level 388 U32 indent; // indentation level
186 U32 maxdepth; // max. indentation/recursion level
187 UV limit; // escape character values >= this value when encoding 389 UV limit; // escape character values >= this value when encoding
188} enc_t; 390} enc_t;
189 391
190INLINE void 392INLINE void
191need (enc_t *enc, STRLEN len) 393need (enc_t *enc, STRLEN len)
192{ 394{
193 if (expect_false (enc->cur + len >= enc->end)) 395 if (expect_false ((uintptr_t)(enc->end - enc->cur) < len))
194 { 396 {
195 STRLEN cur = enc->cur - SvPVX (enc->sv); 397 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
196 SvGROW (enc->sv, cur + len + 1); 398 char *buf = json_sv_grow (enc->sv, cur, len);
197 enc->cur = SvPVX (enc->sv) + cur; 399 enc->cur = buf + cur;
198 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 400 enc->end = buf + SvLEN (enc->sv) - 1;
199 } 401 }
200} 402}
201 403
202INLINE void 404INLINE void
203encode_ch (enc_t *enc, char ch) 405encode_ch (enc_t *enc, char ch)
… …
219 421
220 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case 422 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case
221 { 423 {
222 if (expect_false (ch == '"')) // but with slow exceptions 424 if (expect_false (ch == '"')) // but with slow exceptions
223 { 425 {
224 need (enc, len += 1); 426 need (enc, len + 1);
225 *enc->cur++ = '\\'; 427 *enc->cur++ = '\\';
226 *enc->cur++ = '"'; 428 *enc->cur++ = '"';
227 } 429 }
228 else if (expect_false (ch == '\\')) 430 else if (expect_false (ch == '\\'))
229 { 431 {
230 need (enc, len += 1); 432 need (enc, len + 1);
231 *enc->cur++ = '\\'; 433 *enc->cur++ = '\\';
232 *enc->cur++ = '\\'; 434 *enc->cur++ = '\\';
233 } 435 }
234 else 436 else
235 *enc->cur++ = ch; 437 *enc->cur++ = ch;
… …
238 } 440 }
239 else 441 else
240 { 442 {
241 switch (ch) 443 switch (ch)
242 { 444 {
243 case '\010': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'b'; ++str; break; 445 case '\010': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 'b'; ++str; break;
244 case '\011': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 't'; ++str; break; 446 case '\011': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 't'; ++str; break;
245 case '\012': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'n'; ++str; break; 447 case '\012': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 'n'; ++str; break;
246 case '\014': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'f'; ++str; break; 448 case '\014': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 'f'; ++str; break;
247 case '\015': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'r'; ++str; break; 449 case '\015': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 'r'; ++str; break;
248 450
249 default: 451 default:
250 { 452 {
251 STRLEN clen; 453 STRLEN clen;
252 UV uch; 454 UV uch;
… …
268 if (uch >= 0x10000UL) 470 if (uch >= 0x10000UL)
269 { 471 {
270 if (uch >= 0x110000UL) 472 if (uch >= 0x110000UL)
271 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch); 473 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
272 474
273 need (enc, len += 11); 475 need (enc, len + 11);
274 sprintf (enc->cur, "\\u%04x\\u%04x", 476 sprintf (enc->cur, "\\u%04x\\u%04x",
275 (int)((uch - 0x10000) / 0x400 + 0xD800), 477 (int)((uch - 0x10000) / 0x400 + 0xD800),
276 (int)((uch - 0x10000) % 0x400 + 0xDC00)); 478 (int)((uch - 0x10000) % 0x400 + 0xDC00));
277 enc->cur += 12; 479 enc->cur += 12;
278 } 480 }
279 else 481 else
280 { 482 {
281 static char hexdigit [16] = "0123456789abcdef";
282 need (enc, len += 5); 483 need (enc, len + 5);
283 *enc->cur++ = '\\'; 484 *enc->cur++ = '\\';
284 *enc->cur++ = 'u'; 485 *enc->cur++ = 'u';
285 *enc->cur++ = hexdigit [ uch >> 12 ]; 486 *enc->cur++ = PL_hexdigit [ uch >> 12 ];
286 *enc->cur++ = hexdigit [(uch >> 8) & 15]; 487 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
287 *enc->cur++ = hexdigit [(uch >> 4) & 15]; 488 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
288 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 489 *enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
289 } 490 }
290 491
291 str += clen; 492 str += clen;
292 } 493 }
293 else if (enc->json.flags & F_LATIN1) 494 else if (enc->json.flags & F_LATIN1)
… …
295 *enc->cur++ = uch; 496 *enc->cur++ = uch;
296 str += clen; 497 str += clen;
297 } 498 }
298 else if (is_utf8) 499 else if (is_utf8)
299 { 500 {
300 need (enc, len += clen); 501 need (enc, len + clen);
301 do 502 do
302 { 503 {
303 *enc->cur++ = *str++; 504 *enc->cur++ = *str++;
304 } 505 }
305 while (--clen); 506 while (--clen);
306 } 507 }
307 else 508 else
308 { 509 {
309 need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed 510 need (enc, len + UTF8_MAXBYTES - 1); // never more than 11 bytes needed
310 enc->cur = encode_utf8 (enc->cur, uch); 511 enc->cur = encode_utf8 (enc->cur, uch);
311 ++str; 512 ++str;
312 } 513 }
313 } 514 }
314 } 515 }
… …
364static void 565static void
365encode_av (enc_t *enc, AV *av) 566encode_av (enc_t *enc, AV *av)
366{ 567{
367 int i, len = av_len (av); 568 int i, len = av_len (av);
368 569
369 if (enc->indent >= enc->maxdepth) 570 if (enc->indent >= enc->json.max_depth)
370 croak ("data structure too deep (hit recursion limit)"); 571 croak (ERR_NESTING_EXCEEDED);
371 572
372 encode_ch (enc, '['); 573 encode_ch (enc, '[');
373 574
374 if (len >= 0) 575 if (len >= 0)
375 { 576 {
376 encode_nl (enc); ++enc->indent; 577 encode_nl (enc); ++enc->indent;
377 578
378 for (i = 0; i <= len; ++i) 579 for (i = 0; i <= len; ++i)
… …
390 encode_comma (enc); 591 encode_comma (enc);
391 } 592 }
392 593
393 encode_nl (enc); --enc->indent; encode_indent (enc); 594 encode_nl (enc); --enc->indent; encode_indent (enc);
394 } 595 }
395 596
396 encode_ch (enc, ']'); 597 encode_ch (enc, ']');
397} 598}
398 599
399static void 600static void
400encode_hk (enc_t *enc, HE *he) 601encode_hk (enc_t *enc, HE *he)
… …
404 if (HeKLEN (he) == HEf_SVKEY) 605 if (HeKLEN (he) == HEf_SVKEY)
405 { 606 {
406 SV *sv = HeSVKEY (he); 607 SV *sv = HeSVKEY (he);
407 STRLEN len; 608 STRLEN len;
408 char *str; 609 char *str;
409 610
410 SvGETMAGIC (sv); 611 SvGETMAGIC (sv);
411 str = SvPV (sv, len); 612 str = SvPV (sv, len);
412 613
413 encode_str (enc, str, len, SvUTF8 (sv)); 614 encode_str (enc, str, len, SvUTF8 (sv));
414 } 615 }
… …
450static void 651static void
451encode_hv (enc_t *enc, HV *hv) 652encode_hv (enc_t *enc, HV *hv)
452{ 653{
453 HE *he; 654 HE *he;
454 655
455 if (enc->indent >= enc->maxdepth) 656 if (enc->indent >= enc->json.max_depth)
456 croak ("data structure too deep (hit recursion limit)"); 657 croak (ERR_NESTING_EXCEEDED);
457 658
458 encode_ch (enc, '{'); 659 encode_ch (enc, '{');
459 660
460 // for canonical output we have to sort by keys first 661 // for canonical output we have to sort by keys first
461 // actually, this is mostly due to the stupid so-called 662 // actually, this is mostly due to the stupid so-called
462 // security workaround added somewhere in 5.8.x. 663 // security workaround added somewhere in 5.8.x
463 // that randomises hash orderings 664 // that randomises hash orderings
464 if (enc->json.flags & F_CANONICAL) 665 if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
465 { 666 {
466 int count = hv_iterinit (hv); 667 int count = hv_iterinit (hv);
467 668
468 if (SvMAGICAL (hv)) 669 if (SvMAGICAL (hv))
469 { 670 {
… …
480 } 681 }
481 682
482 if (count) 683 if (count)
483 { 684 {
484 int i, fast = 1; 685 int i, fast = 1;
485#if defined(__BORLANDC__) || defined(_MSC_VER) 686 HE *hes_stack [STACK_HES];
486 HE **hes = _alloca (count * sizeof (HE)); 687 HE **hes = hes_stack;
487#else 688
488 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 689 // allocate larger arrays on the heap
489#endif 690 if (count > STACK_HES)
691 {
692 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes)));
693 hes = (HE **)SvPVX (sv);
694 }
490 695
491 i = 0; 696 i = 0;
492 while ((he = hv_iternext (hv))) 697 while ((he = hv_iternext (hv)))
493 { 698 {
494 hes [i++] = he; 699 hes [i++] = he;
… …
563// encode objects, arrays and special \0=false and \1=true values. 768// encode objects, arrays and special \0=false and \1=true values.
564static void 769static void
565encode_rv (enc_t *enc, SV *sv) 770encode_rv (enc_t *enc, SV *sv)
566{ 771{
567 svtype svt; 772 svtype svt;
773 GV *method;
568 774
569 SvGETMAGIC (sv); 775 SvGETMAGIC (sv);
570 svt = SvTYPE (sv); 776 svt = SvTYPE (sv);
571 777
572 if (expect_false (SvOBJECT (sv))) 778 if (expect_false (SvOBJECT (sv)))
573 { 779 {
574 HV *stash = !JSON_SLOW || json_boolean_stash 780 HV *stash = SvSTASH (sv);
575 ? json_boolean_stash
576 : gv_stashpv ("JSON::XS::Boolean", 1);
577 781
578 if (SvSTASH (sv) == stash) 782 if (stash == bool_stash)
579 { 783 {
580 if (SvIV (sv))
581 encode_str (enc, "true", 4, 0); 784 if (SvIV (sv)) encode_str (enc, "true" , 4, 0);
582 else
583 encode_str (enc, "false", 5, 0); 785 else encode_str (enc, "false", 5, 0);
584 } 786 }
787 else if ((enc->json.flags & F_ALLOW_TAGS) && (method = gv_fetchmethod_autoload (stash, "FREEZE", 0)))
788 {
789 int count;
790 dSP;
791
792 ENTER; SAVETMPS;
793 PUSHMARK (SP);
794 EXTEND (SP, 2);
795 // we re-bless the reference to get overload and other niceties right
796 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
797 PUSHs (sv_json);
798
799 PUTBACK;
800 count = call_sv ((SV *)GvCV (method), G_ARRAY);
801 SPAGAIN;
802
803 // catch this surprisingly common error
804 if (SvROK (TOPs) && SvRV (TOPs) == sv)
805 croak ("%s::FREEZE method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
806
807 encode_ch (enc, '(');
808 encode_ch (enc, '"');
809 encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
810 encode_ch (enc, '"');
811 encode_ch (enc, ')');
812 encode_ch (enc, '[');
813
814 if (count)
815 {
816 int i;
817
818 for (i = 0; i < count - 1; ++i)
819 {
820 encode_sv (enc, SP[i + 1 - count]);
821 encode_ch (enc, ',');
822 }
823
824 encode_sv (enc, TOPs);
825 SP -= count;
826 }
827
828 encode_ch (enc, ']');
829
830 FREETMPS; LEAVE;
831 }
832 else if ((enc->json.flags & F_CONV_BLESSED) && (method = gv_fetchmethod_autoload (stash, "TO_JSON", 0)))
833 {
834 dSP;
835
836 ENTER; SAVETMPS;
837 PUSHMARK (SP);
838 // we re-bless the reference to get overload and other niceties right
839 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
840
841 // calling with G_SCALAR ensures that we always get a 1 return value
842 PUTBACK;
843 call_sv ((SV *)GvCV (method), G_SCALAR);
844 SPAGAIN;
845
846 // catch this surprisingly common error
847 if (SvROK (TOPs) && SvRV (TOPs) == sv)
848 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
849
850 sv = POPs;
851 PUTBACK;
852
853 encode_sv (enc, sv);
854
855 FREETMPS; LEAVE;
856 }
857 else if (enc->json.flags & F_ALLOW_BLESSED)
858 encode_str (enc, "null", 4, 0);
585 else 859 else
586 {
587#if 0
588 if (0 && sv_derived_from (rv, "JSON::Literal"))
589 {
590 // not yet
591 }
592#endif
593 if (enc->json.flags & F_CONV_BLESSED)
594 {
595 // we re-bless the reference to get overload and other niceties right
596 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
597
598 if (to_json)
599 {
600 dSP;
601
602 ENTER; SAVETMPS; PUSHMARK (SP);
603 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
604
605 // calling with G_SCALAR ensures that we always get a 1 return value
606 PUTBACK;
607 call_sv ((SV *)GvCV (to_json), G_SCALAR);
608 SPAGAIN;
609
610 // catch this surprisingly common error
611 if (SvROK (TOPs) && SvRV (TOPs) == sv)
612 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
613
614 sv = POPs;
615 PUTBACK;
616
617 encode_sv (enc, sv);
618
619 FREETMPS; LEAVE;
620 }
621 else if (enc->json.flags & F_ALLOW_BLESSED)
622 encode_str (enc, "null", 4, 0);
623 else
624 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
625 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
626 }
627 else if (enc->json.flags & F_ALLOW_BLESSED)
628 encode_str (enc, "null", 4, 0);
629 else
630 croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled", 860 croak ("encountered object '%s', but neither allow_blessed, convert_blessed nor allow_tags settings are enabled (or TO_JSON/FREEZE method missing)",
631 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 861 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
632 }
633 } 862 }
634 else if (svt == SVt_PVHV) 863 else if (svt == SVt_PVHV)
635 encode_hv (enc, (HV *)sv); 864 encode_hv (enc, (HV *)sv);
636 else if (svt == SVt_PVAV) 865 else if (svt == SVt_PVAV)
637 encode_av (enc, (AV *)sv); 866 encode_av (enc, (AV *)sv);
638 else if (svt < SVt_PVAV) 867 else if (svt < SVt_PVAV)
639 { 868 {
640 STRLEN len = 0; 869 int bool_type = ref_bool_type (sv);
641 char *pv = svt ? SvPV (sv, len) : 0;
642 870
643 if (len == 1 && *pv == '1') 871 if (bool_type == 1)
644 encode_str (enc, "true", 4, 0); 872 encode_str (enc, "true", 4, 0);
645 else if (len == 1 && *pv == '0') 873 else if (bool_type == 0)
646 encode_str (enc, "false", 5, 0); 874 encode_str (enc, "false", 5, 0);
875 else if (enc->json.flags & F_ALLOW_UNKNOWN)
876 encode_str (enc, "null", 4, 0);
647 else 877 else
648 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 878 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
649 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 879 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
650 } 880 }
881 else if (enc->json.flags & F_ALLOW_UNKNOWN)
882 encode_str (enc, "null", 4, 0);
651 else 883 else
652 croak ("encountered %s, but JSON can only represent references to arrays or hashes", 884 croak ("encountered %s, but JSON can only represent references to arrays or hashes",
653 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 885 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
654} 886}
655 887
… …
709 } 941 }
710 else 942 else
711 { 943 {
712 // large integer, use the (rather slow) snprintf way. 944 // large integer, use the (rather slow) snprintf way.
713 need (enc, IVUV_MAXCHARS); 945 need (enc, IVUV_MAXCHARS);
714 enc->cur += 946 enc->cur +=
715 SvIsUV(sv) 947 SvIsUV(sv)
716 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv)) 948 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
717 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv)); 949 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
718 } 950 }
719 } 951 }
720 else if (SvROK (sv)) 952 else if (SvROK (sv))
721 encode_rv (enc, SvRV (sv)); 953 encode_rv (enc, SvRV (sv));
722 else if (!SvOK (sv)) 954 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
723 encode_str (enc, "null", 4, 0); 955 encode_str (enc, "null", 4, 0);
724 else 956 else
725 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 957 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, check your input data",
726 SvPV_nolen (sv), SvFLAGS (sv)); 958 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
727} 959}
728 960
729static SV * 961static SV *
730encode_json (SV *scalar, JSON *json) 962encode_json (SV *scalar, JSON *json)
731{ 963{
732 enc_t enc; 964 enc_t enc;
733 965
734 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar)) 966 if (!(json->flags & F_ALLOW_NONREF) && json_nonref (scalar))
735 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)"); 967 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
736 968
737 enc.json = *json; 969 enc.json = *json;
738 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 970 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
739 enc.cur = SvPVX (enc.sv); 971 enc.cur = SvPVX (enc.sv);
740 enc.end = SvEND (enc.sv); 972 enc.end = SvEND (enc.sv);
741 enc.indent = 0; 973 enc.indent = 0;
742 enc.maxdepth = DEC_DEPTH (enc.json.flags);
743 enc.limit = enc.json.flags & F_ASCII ? 0x000080UL 974 enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
744 : enc.json.flags & F_LATIN1 ? 0x000100UL 975 : enc.json.flags & F_LATIN1 ? 0x000100UL
745 : 0x110000UL; 976 : 0x110000UL;
746 977
747 SvPOK_only (enc.sv); 978 SvPOK_only (enc.sv);
748 encode_sv (&enc, scalar); 979 encode_sv (&enc, scalar);
980 encode_nl (&enc);
749 981
750 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 982 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
751 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 983 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
752 984
753 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8))) 985 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
… …
814 if (*dec->cur != ch) \ 1046 if (*dec->cur != ch) \
815 ERR (# ch " expected"); \ 1047 ERR (# ch " expected"); \
816 ++dec->cur; \ 1048 ++dec->cur; \
817 SE 1049 SE
818 1050
819#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)") 1051#define DEC_INC_DEPTH if (++dec->depth > dec->json.max_depth) ERR (ERR_NESTING_EXCEEDED)
820#define DEC_DEC_DEPTH --dec->depth 1052#define DEC_DEC_DEPTH --dec->depth
821 1053
822static SV *decode_sv (dec_t *dec); 1054static SV *decode_sv (dec_t *dec);
823 1055
824static signed char decode_hexdigit[256]; 1056static signed char decode_hexdigit[256];
… …
933 else if (expect_true (ch >= 0x20 && ch < 0x80)) 1165 else if (expect_true (ch >= 0x20 && ch < 0x80))
934 *cur++ = ch; 1166 *cur++ = ch;
935 else if (ch >= 0x80) 1167 else if (ch >= 0x80)
936 { 1168 {
937 STRLEN clen; 1169 STRLEN clen;
938 UV uch;
939 1170
940 --dec_cur; 1171 --dec_cur;
941 1172
942 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen); 1173 decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
943 if (clen == (STRLEN)-1) 1174 if (clen == (STRLEN)-1)
944 ERR ("malformed UTF-8 character in JSON string"); 1175 ERR ("malformed UTF-8 character in JSON string");
945 1176
946 do 1177 do
947 *cur++ = *dec_cur++; 1178 *cur++ = *dec_cur++;
948 while (--clen); 1179 while (--clen);
949 1180
950 utf8 = 1; 1181 utf8 = 1;
951 } 1182 }
1183 else if (ch == '\t' && dec->json.flags & F_RELAXED)
1184 *cur++ = ch;
952 else 1185 else
953 { 1186 {
954 --dec_cur; 1187 --dec_cur;
955 1188
956 if (!ch) 1189 if (!ch)
… …
964 { 1197 {
965 STRLEN len = cur - buf; 1198 STRLEN len = cur - buf;
966 1199
967 if (sv) 1200 if (sv)
968 { 1201 {
969 SvGROW (sv, SvCUR (sv) + len + 1); 1202 STRLEN cur = SvCUR (sv);
1203
1204 if (SvLEN (sv) - cur <= len)
1205 json_sv_grow (sv, cur, len);
1206
970 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 1207 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
971 SvCUR_set (sv, SvCUR (sv) + len); 1208 SvCUR_set (sv, SvCUR (sv) + len);
972 } 1209 }
973 else 1210 else
974 sv = newSVpvn (buf, len); 1211 sv = newSVpvn (buf, len);
… …
1065 1302
1066 // special case the rather common 1..5-digit-int case 1303 // special case the rather common 1..5-digit-int case
1067 if (*start == '-') 1304 if (*start == '-')
1068 switch (len) 1305 switch (len)
1069 { 1306 {
1070 case 2: return newSViv (-( start [1] - '0' * 1)); 1307 case 2: return newSViv (-(IV)( start [1] - '0' * 1));
1071 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11)); 1308 case 3: return newSViv (-(IV)( start [1] * 10 + start [2] - '0' * 11));
1072 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111)); 1309 case 4: return newSViv (-(IV)( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
1073 case 5: return newSViv (-( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111)); 1310 case 5: return newSViv (-(IV)( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
1074 case 6: return newSViv (-(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111)); 1311 case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
1075 } 1312 }
1076 else 1313 else
1077 switch (len) 1314 switch (len)
1078 { 1315 {
1079 case 1: return newSViv ( start [0] - '0' * 1); 1316 case 1: return newSViv ( start [0] - '0' * 1);
1080 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11); 1317 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
1081 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111); 1318 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
1082 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111); 1319 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
1083 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111); 1320 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
1084 } 1321 }
1085 1322
1086 { 1323 {
1087 UV uv; 1324 UV uv;
1088 int numtype = grok_number (start, len, &uv); 1325 int numtype = grok_number (start, len, &uv);
… …
1097 } 1334 }
1098 1335
1099 len -= *start == '-' ? 1 : 0; 1336 len -= *start == '-' ? 1 : 0;
1100 1337
1101 // does not fit into IV or UV, try NV 1338 // does not fit into IV or UV, try NV
1102 if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len) 1339 if (len <= NV_DIG)
1103 #if defined (LDBL_DIG)
1104 || (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
1105 #endif
1106 )
1107 // fits into NV without loss of precision 1340 // fits into NV without loss of precision
1108 return newSVnv (Atof (start)); 1341 return newSVnv (json_atof (start));
1109 1342
1110 // everything else fails, convert it to a string 1343 // everything else fails, convert it to a string
1111 return newSVpvn (start, dec->cur - start); 1344 return newSVpvn (start, dec->cur - start);
1112 } 1345 }
1113 1346
1114 // loss of precision here 1347 // loss of precision here
1115 return newSVnv (Atof (start)); 1348 return newSVnv (json_atof (start));
1116 1349
1117fail: 1350fail:
1118 return 0; 1351 return 0;
1119} 1352}
1120 1353
… …
1144 if (*dec->cur == ']') 1377 if (*dec->cur == ']')
1145 { 1378 {
1146 ++dec->cur; 1379 ++dec->cur;
1147 break; 1380 break;
1148 } 1381 }
1149 1382
1150 if (*dec->cur != ',') 1383 if (*dec->cur != ',')
1151 ERR (", or ] expected while parsing array"); 1384 ERR (", or ] expected while parsing array");
1152 1385
1153 ++dec->cur; 1386 ++dec->cur;
1154 1387
… …
1278 1511
1279 hv_iterinit (hv); 1512 hv_iterinit (hv);
1280 he = hv_iternext (hv); 1513 he = hv_iternext (hv);
1281 hv_iterinit (hv); 1514 hv_iterinit (hv);
1282 1515
1283 // the next line creates a mortal sv each time its called. 1516 // the next line creates a mortal sv each time it's called.
1284 // might want to optimise this for common cases. 1517 // might want to optimise this for common cases.
1285 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0); 1518 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
1286 1519
1287 if (cb) 1520 if (cb)
1288 { 1521 {
1289 dSP; 1522 dSP;
1290 int count; 1523 int count;
1291 1524
1292 ENTER; SAVETMPS; PUSHMARK (SP); 1525 ENTER; SAVETMPS;
1526 PUSHMARK (SP);
1293 XPUSHs (HeVAL (he)); 1527 XPUSHs (HeVAL (he));
1528 sv_2mortal (sv);
1294 1529
1295 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1530 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1296 1531
1297 if (count == 1) 1532 if (count == 1)
1298 { 1533 {
1299 sv = newSVsv (POPs); 1534 sv = newSVsv (POPs);
1300 FREETMPS; LEAVE; 1535 FREETMPS; LEAVE;
1301 return sv; 1536 return sv;
1302 } 1537 }
1538 else if (count)
1539 croak ("filter_json_single_key_object callbacks must not return more than one scalar");
1303 1540
1541 SvREFCNT_inc (sv);
1304 FREETMPS; LEAVE; 1542 FREETMPS; LEAVE;
1305 } 1543 }
1306 } 1544 }
1307 1545
1308 if (dec->json.cb_object) 1546 if (dec->json.cb_object)
1309 { 1547 {
1310 dSP; 1548 dSP;
1311 int count; 1549 int count;
1312 1550
1313 ENTER; SAVETMPS; PUSHMARK (SP); 1551 ENTER; SAVETMPS;
1552 PUSHMARK (SP);
1314 XPUSHs (sv_2mortal (sv)); 1553 XPUSHs (sv_2mortal (sv));
1315 1554
1316 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN; 1555 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1317 1556
1318 if (count == 1) 1557 if (count == 1)
1319 { 1558 {
1320 sv = newSVsv (POPs); 1559 sv = newSVsv (POPs);
1321 FREETMPS; LEAVE; 1560 FREETMPS; LEAVE;
1322 return sv; 1561 return sv;
1323 } 1562 }
1563 else if (count)
1564 croak ("filter_json_object callbacks must not return more than one scalar");
1324 1565
1325 SvREFCNT_inc (sv); 1566 SvREFCNT_inc (sv);
1326 FREETMPS; LEAVE; 1567 FREETMPS; LEAVE;
1327 } 1568 }
1328 } 1569 }
… …
1334 DEC_DEC_DEPTH; 1575 DEC_DEC_DEPTH;
1335 return 0; 1576 return 0;
1336} 1577}
1337 1578
1338static SV * 1579static SV *
1580decode_tag (dec_t *dec)
1581{
1582 SV *tag = 0;
1583 SV *val = 0;
1584
1585 if (!(dec->json.flags & F_ALLOW_TAGS))
1586 ERR ("malformed JSON string, neither array, object, number, string or atom");
1587
1588 ++dec->cur;
1589
1590 decode_ws (dec);
1591
1592 tag = decode_sv (dec);
1593 if (!tag)
1594 goto fail;
1595
1596 if (!SvPOK (tag))
1597 ERR ("malformed JSON string, (tag) must be a string");
1598
1599 decode_ws (dec);
1600
1601 if (*dec->cur != ')')
1602 ERR (") expected after tag");
1603
1604 ++dec->cur;
1605
1606 decode_ws (dec);
1607
1608 val = decode_sv (dec);
1609 if (!val)
1610 goto fail;
1611
1612 if (!SvROK (val) || SvTYPE (SvRV (val)) != SVt_PVAV)
1613 ERR ("malformed JSON string, tag value must be an array");
1614
1615 {
1616 AV *av = (AV *)SvRV (val);
1617 int i, len = av_len (av) + 1;
1618 HV *stash = gv_stashsv (tag, 0);
1619 SV *sv;
1620
1621 if (!stash)
1622 ERR ("cannot decode perl-object (package does not exist)");
1623
1624 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
1625
1626 if (!method)
1627 ERR ("cannot decode perl-object (package does not have a THAW method)");
1628
1629 dSP;
1630
1631 ENTER; SAVETMPS;
1632 PUSHMARK (SP);
1633 EXTEND (SP, len + 2);
1634 // we re-bless the reference to get overload and other niceties right
1635 PUSHs (tag);
1636 PUSHs (sv_json);
1637
1638 for (i = 0; i < len; ++i)
1639 PUSHs (*av_fetch (av, i, 1));
1640
1641 PUTBACK;
1642 call_sv ((SV *)GvCV (method), G_SCALAR);
1643 SPAGAIN;
1644
1645 SvREFCNT_dec (tag);
1646 SvREFCNT_dec (val);
1647 sv = SvREFCNT_inc (POPs);
1648
1649 PUTBACK;
1650
1651 FREETMPS; LEAVE;
1652
1653 return sv;
1654 }
1655
1656fail:
1657 SvREFCNT_dec (tag);
1658 SvREFCNT_dec (val);
1659 return 0;
1660}
1661
1662static SV *
1339decode_sv (dec_t *dec) 1663decode_sv (dec_t *dec)
1340{ 1664{
1341 // the beauty of JSON: you need exactly one character lookahead 1665 // the beauty of JSON: you need exactly one character lookahead
1342 // to parse everything. 1666 // to parse everything.
1343 switch (*dec->cur) 1667 switch (*dec->cur)
1344 { 1668 {
1345 case '"': ++dec->cur; return decode_str (dec); 1669 case '"': ++dec->cur; return decode_str (dec);
1346 case '[': ++dec->cur; return decode_av (dec); 1670 case '[': ++dec->cur; return decode_av (dec);
1347 case '{': ++dec->cur; return decode_hv (dec); 1671 case '{': ++dec->cur; return decode_hv (dec);
1672 case '(': return decode_tag (dec);
1348 1673
1349 case '-': 1674 case '-':
1350 case '0': case '1': case '2': case '3': case '4': 1675 case '0': case '1': case '2': case '3': case '4':
1351 case '5': case '6': case '7': case '8': case '9': 1676 case '5': case '6': case '7': case '8': case '9':
1352 return decode_num (dec); 1677 return decode_num (dec);
1353 1678
1679 case 'f':
1680 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1681 {
1682 dec->cur += 5;
1683
1684 if (expect_false (!dec->json.v_false))
1685 dec->json.v_false = GET_BOOL (false);
1686
1687 return newSVsv (dec->json.v_false);
1688 }
1689 else
1690 ERR ("'false' expected");
1691
1692 break;
1693
1354 case 't': 1694 case 't':
1355 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1695 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1356 { 1696 {
1357 dec->cur += 4; 1697 dec->cur += 4;
1358#if JSON_SLOW 1698
1359 json_true = get_bool ("JSON::XS::true"); 1699 if (expect_false (!dec->json.v_true))
1360#endif 1700 dec->json.v_true = GET_BOOL (true);
1701
1361 return newSVsv (json_true); 1702 return newSVsv (dec->json.v_true);
1362 } 1703 }
1363 else 1704 else
1364 ERR ("'true' expected"); 1705 ERR ("'true' expected");
1365
1366 break;
1367
1368 case 'f':
1369 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1370 {
1371 dec->cur += 5;
1372#if JSON_SLOW
1373 json_false = get_bool ("JSON::XS::false");
1374#endif
1375 return newSVsv (json_false);
1376 }
1377 else
1378 ERR ("'false' expected");
1379 1706
1380 break; 1707 break;
1381 1708
1382 case 'n': 1709 case 'n':
1383 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4)) 1710 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4))
… …
1389 ERR ("'null' expected"); 1716 ERR ("'null' expected");
1390 1717
1391 break; 1718 break;
1392 1719
1393 default: 1720 default:
1394 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1721 ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1395 break; 1722 break;
1396 } 1723 }
1397 1724
1398fail: 1725fail:
1399 return 0; 1726 return 0;
… …
1401 1728
1402static SV * 1729static SV *
1403decode_json (SV *string, JSON *json, STRLEN *offset_return) 1730decode_json (SV *string, JSON *json, STRLEN *offset_return)
1404{ 1731{
1405 dec_t dec; 1732 dec_t dec;
1406 STRLEN offset;
1407 SV *sv; 1733 SV *sv;
1408 1734
1735 /* work around bugs in 5.10 where manipulating magic values
1736 * makes perl ignore the magic in subsequent accesses.
1737 * also make a copy of non-PV values, to get them into a clean
1738 * state (SvPV should do that, but it's buggy, see below).
1739 *
1740 * SvIsCOW_shared_hash works around a bug in perl (possibly 5.16),
1741 * as reported by Reini Urban.
1742 */
1409 SvGETMAGIC (string); 1743 /*SvGETMAGIC (string);*/
1744 if (SvMAGICAL (string) || !SvPOK (string) || SvIsCOW_shared_hash (string))
1745 string = sv_2mortal (newSVsv (string));
1746
1410 SvUPGRADE (string, SVt_PV); 1747 SvUPGRADE (string, SVt_PV);
1411 1748
1412 if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags)) 1749 /* work around a bug in perl 5.10, which causes SvCUR to fail an
1750 * assertion with -DDEBUGGING, although SvCUR is documented to
1751 * return the xpv_cur field which certainly exists after upgrading.
1752 * according to nicholas clark, calling SvPOK fixes this.
1753 * But it doesn't fix it, so try another workaround, call SvPV_nolen
1754 * and hope for the best.
1755 * Damnit, SvPV_nolen still trips over yet another assertion. This
1756 * assertion business is seriously broken, try yet another workaround
1757 * for the broken -DDEBUGGING.
1758 */
1759 {
1760#ifdef DEBUGGING
1761 STRLEN offset = SvOK (string) ? sv_len (string) : 0;
1762#else
1763 STRLEN offset = SvCUR (string);
1764#endif
1765
1766 if (offset > json->max_size && json->max_size)
1413 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 1767 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1414 (unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags)); 1768 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1769 }
1415 1770
1416 if (json->flags & F_UTF8) 1771 if (DECODE_WANTS_OCTETS (json))
1417 sv_utf8_downgrade (string, 0); 1772 sv_utf8_downgrade (string, 0);
1418 else 1773 else
1419 sv_utf8_upgrade (string); 1774 sv_utf8_upgrade (string);
1420 1775
1421 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1776 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1422 1777
1423 dec.json = *json; 1778 dec.json = *json;
1424 dec.cur = SvPVX (string); 1779 dec.cur = SvPVX (string);
1425 dec.end = SvEND (string); 1780 dec.end = SvEND (string);
1426 dec.err = 0; 1781 dec.err = 0;
1427 dec.depth = 0; 1782 dec.depth = 0;
1428 dec.maxdepth = DEC_DEPTH (dec.json.flags);
1429 1783
1430 if (dec.json.cb_object || dec.json.cb_sk_object) 1784 if (dec.json.cb_object || dec.json.cb_sk_object)
1431 dec.json.flags |= F_HOOK; 1785 dec.json.flags |= F_HOOK;
1432 1786
1433 *dec.end = 0; // this should basically be a nop, too, but make sure it's there 1787 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1434 1788
1435 decode_ws (&dec); 1789 decode_ws (&dec);
1436 sv = decode_sv (&dec); 1790 sv = decode_sv (&dec);
1437 1791
1438 if (!(offset_return || !sv)) 1792 if (offset_return)
1793 *offset_return = dec.cur - SvPVX (string);
1794 else if (sv)
1439 { 1795 {
1440 // check for trailing garbage 1796 // check for trailing garbage
1441 decode_ws (&dec); 1797 decode_ws (&dec);
1442 1798
1443 if (*dec.cur) 1799 if (*dec.cur)
1444 { 1800 {
1445 dec.err = "garbage after JSON object"; 1801 dec.err = "garbage after JSON object";
1446 SvREFCNT_dec (sv); 1802 SvREFCNT_dec (sv);
1447 sv = 0; 1803 sv = 0;
1448 } 1804 }
1449 }
1450
1451 if (offset_return || !sv)
1452 {
1453 offset = dec.json.flags & F_UTF8
1454 ? dec.cur - SvPVX (string)
1455 : utf8_distance (dec.cur, SvPVX (string));
1456
1457 if (offset_return)
1458 *offset_return = offset;
1459 } 1805 }
1460 1806
1461 if (!sv) 1807 if (!sv)
1462 { 1808 {
1463 SV *uni = sv_newmortal (); 1809 SV *uni = sv_newmortal ();
… …
1469 SAVEVPTR (PL_curcop); 1815 SAVEVPTR (PL_curcop);
1470 PL_curcop = &cop; 1816 PL_curcop = &cop;
1471 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1817 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1472 LEAVE; 1818 LEAVE;
1473 1819
1474 croak ("%s, at character offset %d [\"%s\"]", 1820 croak ("%s, at character offset %d (before \"%s\")",
1475 dec.err, 1821 dec.err,
1476 (int)offset, 1822 (int)ptr_to_index (string, dec.cur),
1477 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1823 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1478 } 1824 }
1479 1825
1480 sv = sv_2mortal (sv); 1826 sv = sv_2mortal (sv);
1481 1827
1482 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1828 if (!(dec.json.flags & F_ALLOW_NONREF) && json_nonref (sv))
1483 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)"); 1829 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1484 1830
1485 return sv; 1831 return sv;
1486} 1832}
1487 1833
… …
1490 1836
1491static void 1837static void
1492incr_parse (JSON *self) 1838incr_parse (JSON *self)
1493{ 1839{
1494 const char *p = SvPVX (self->incr_text) + self->incr_pos; 1840 const char *p = SvPVX (self->incr_text) + self->incr_pos;
1841
1842 // the state machine here is a bit convoluted and could be simplified a lot
1843 // but this would make it slower, so...
1495 1844
1496 for (;;) 1845 for (;;)
1497 { 1846 {
1498 //printf ("loop pod %d *p<%c><%s>, mode %d nest %d\n", p - SvPVX (self->incr_text), *p, p, self->incr_mode, self->incr_nest);//D 1847 //printf ("loop pod %d *p<%c><%s>, mode %d nest %d\n", p - SvPVX (self->incr_text), *p, p, self->incr_mode, self->incr_nest);//D
1499 switch (self->incr_mode) 1848 switch (self->incr_mode)
1500 { 1849 {
1501 // only used for intiial whitespace skipping 1850 // only used for initial whitespace skipping
1502 case INCR_M_WS: 1851 case INCR_M_WS:
1503 for (;;) 1852 for (;;)
1504 { 1853 {
1505 if (*p > 0x20) 1854 if (*p > 0x20)
1506 { 1855 {
1856 if (*p == '#')
1857 {
1858 self->incr_mode = INCR_M_C0;
1859 goto incr_m_c;
1860 }
1861 else
1862 {
1507 self->incr_mode = INCR_M_JSON; 1863 self->incr_mode = INCR_M_JSON;
1508 goto incr_m_json; 1864 goto incr_m_json;
1865 }
1509 } 1866 }
1510 else if (!*p) 1867 else if (!*p)
1511 goto interrupt; 1868 goto interrupt;
1512 1869
1513 ++p; 1870 ++p;
… …
1519 goto interrupt; 1876 goto interrupt;
1520 1877
1521 ++p; 1878 ++p;
1522 self->incr_mode = INCR_M_STR; 1879 self->incr_mode = INCR_M_STR;
1523 goto incr_m_str; 1880 goto incr_m_str;
1881
1882 // inside #-style comments
1883 case INCR_M_C0:
1884 case INCR_M_C1:
1885 incr_m_c:
1886 for (;;)
1887 {
1888 if (*p == '\n')
1889 {
1890 self->incr_mode = self->incr_mode == INCR_M_C0 ? INCR_M_WS : INCR_M_JSON;
1891 break;
1892 }
1893 else if (!*p)
1894 goto interrupt;
1895
1896 ++p;
1897 }
1898
1899 break;
1524 1900
1525 // inside a string 1901 // inside a string
1526 case INCR_M_STR: 1902 case INCR_M_STR:
1527 incr_m_str: 1903 incr_m_str:
1528 for (;;) 1904 for (;;)
… …
1579 self->incr_mode = INCR_M_STR; 1955 self->incr_mode = INCR_M_STR;
1580 goto incr_m_str; 1956 goto incr_m_str;
1581 1957
1582 case '[': 1958 case '[':
1583 case '{': 1959 case '{':
1960 case '(':
1584 ++self->incr_nest; 1961 if (++self->incr_nest > self->max_depth)
1962 croak (ERR_NESTING_EXCEEDED);
1585 break; 1963 break;
1586 1964
1587 case ']': 1965 case ']':
1588 case '}': 1966 case '}':
1589 if (!--self->incr_nest) 1967 if (--self->incr_nest <= 0)
1590 goto interrupt; 1968 goto interrupt;
1969 break;
1970
1971 case ')':
1972 --self->incr_nest;
1973 break;
1974
1975 case '#':
1976 self->incr_mode = INCR_M_C1;
1977 goto incr_m_c;
1591 } 1978 }
1592 } 1979 }
1593 } 1980 }
1594 1981
1595 modechange: 1982 modechange:
1596 ; 1983 ;
1597 } 1984 }
1598 1985
1599interrupt: 1986interrupt:
1600 self->incr_pos = p - SvPVX (self->incr_text); 1987 self->incr_pos = p - SvPVX (self->incr_text);
1988 //printf ("interrupt<%.*s>\n", self->incr_pos, SvPVX(self->incr_text));//D
1601 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D 1989 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1602} 1990}
1603 1991
1604///////////////////////////////////////////////////////////////////////////// 1992/////////////////////////////////////////////////////////////////////////////
1605// XS interface functions 1993// XS interface functions
… …
1615 i >= '0' && i <= '9' ? i - '0' 2003 i >= '0' && i <= '9' ? i - '0'
1616 : i >= 'a' && i <= 'f' ? i - 'a' + 10 2004 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1617 : i >= 'A' && i <= 'F' ? i - 'A' + 10 2005 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1618 : -1; 2006 : -1;
1619 2007
1620 json_stash = gv_stashpv ("JSON::XS" , 1); 2008 json_stash = gv_stashpv ("JSON::XS" , 1);
1621 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 2009 bool_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1622
1623 json_true = get_bool ("JSON::XS::true");
1624 json_false = get_bool ("JSON::XS::false"); 2010 bool_false = get_bool ("Types::Serialiser::false");
2011 bool_true = get_bool ("Types::Serialiser::true");
2012
2013 sv_json = newSVpv ("JSON", 0);
2014 SvREADONLY_on (sv_json);
2015
2016 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1625} 2017}
1626 2018
1627PROTOTYPES: DISABLE 2019PROTOTYPES: DISABLE
1628 2020
1629void CLONE (...) 2021void CLONE (...)
1630 CODE: 2022 CODE:
2023 // as long as these writes are atomic, the race should not matter
2024 // as existing threads either already use 0, or use the old value,
2025 // which is sitll correct for the initial thread.
1631 json_stash = 0; 2026 json_stash = 0;
1632 json_boolean_stash = 0; 2027 bool_stash = 0;
2028 bool_false = 0;
2029 bool_true = 0;
1633 2030
1634void new (char *klass) 2031void new (char *klass)
1635 PPCODE: 2032 PPCODE:
1636{ 2033{
1637 SV *pv = NEWSV (0, sizeof (JSON)); 2034 SV *pv = NEWSV (0, sizeof (JSON));
1638 SvPOK_only (pv); 2035 SvPOK_only (pv);
1639 Zero (SvPVX (pv), 1, JSON); 2036 json_init ((JSON *)SvPVX (pv));
1640 ((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1641 XPUSHs (sv_2mortal (sv_bless ( 2037 XPUSHs (sv_2mortal (sv_bless (
1642 newRV_noinc (pv), 2038 newRV_noinc (pv),
1643 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 2039 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1644 ))); 2040 )));
1645} 2041}
2042
2043void boolean_values (JSON *self, SV *v_false = 0, SV *v_true = 0)
2044 PPCODE:
2045 self->v_false = newSVsv (v_false);
2046 self->v_true = newSVsv (v_true);
2047 XPUSHs (ST (0));
2048
2049void get_boolean_values (JSON *self)
2050 PPCODE:
2051 if (self->v_false && self->v_true)
2052 {
2053 EXTEND (SP, 2);
2054 PUSHs (self->v_false);
2055 PUSHs (self->v_true);
2056 }
1646 2057
1647void ascii (JSON *self, int enable = 1) 2058void ascii (JSON *self, int enable = 1)
1648 ALIAS: 2059 ALIAS:
1649 ascii = F_ASCII 2060 ascii = F_ASCII
1650 latin1 = F_LATIN1 2061 latin1 = F_LATIN1
… …
1657 allow_nonref = F_ALLOW_NONREF 2068 allow_nonref = F_ALLOW_NONREF
1658 shrink = F_SHRINK 2069 shrink = F_SHRINK
1659 allow_blessed = F_ALLOW_BLESSED 2070 allow_blessed = F_ALLOW_BLESSED
1660 convert_blessed = F_CONV_BLESSED 2071 convert_blessed = F_CONV_BLESSED
1661 relaxed = F_RELAXED 2072 relaxed = F_RELAXED
2073 allow_unknown = F_ALLOW_UNKNOWN
2074 allow_tags = F_ALLOW_TAGS
1662 PPCODE: 2075 PPCODE:
1663{ 2076{
1664 if (enable) 2077 if (enable)
1665 self->flags |= ix; 2078 self->flags |= ix;
1666 else 2079 else
… …
1681 get_allow_nonref = F_ALLOW_NONREF 2094 get_allow_nonref = F_ALLOW_NONREF
1682 get_shrink = F_SHRINK 2095 get_shrink = F_SHRINK
1683 get_allow_blessed = F_ALLOW_BLESSED 2096 get_allow_blessed = F_ALLOW_BLESSED
1684 get_convert_blessed = F_CONV_BLESSED 2097 get_convert_blessed = F_CONV_BLESSED
1685 get_relaxed = F_RELAXED 2098 get_relaxed = F_RELAXED
2099 get_allow_unknown = F_ALLOW_UNKNOWN
2100 get_allow_tags = F_ALLOW_TAGS
1686 PPCODE: 2101 PPCODE:
1687 XPUSHs (boolSV (self->flags & ix)); 2102 XPUSHs (boolSV (self->flags & ix));
1688 2103
1689void max_depth (JSON *self, UV max_depth = 0x80000000UL) 2104void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1690 PPCODE: 2105 PPCODE:
1691{ 2106 self->max_depth = max_depth;
1692 UV log2 = 0;
1693
1694 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1695
1696 while ((1UL << log2) < max_depth)
1697 ++log2;
1698
1699 self->flags = self->flags & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1700
1701 XPUSHs (ST (0)); 2107 XPUSHs (ST (0));
1702}
1703 2108
1704U32 get_max_depth (JSON *self) 2109U32 get_max_depth (JSON *self)
1705 CODE: 2110 CODE:
1706 RETVAL = DEC_DEPTH (self->flags); 2111 RETVAL = self->max_depth;
1707 OUTPUT: 2112 OUTPUT:
1708 RETVAL 2113 RETVAL
1709 2114
1710void max_size (JSON *self, UV max_size = 0) 2115void max_size (JSON *self, U32 max_size = 0)
1711 PPCODE: 2116 PPCODE:
1712{ 2117 self->max_size = max_size;
1713 UV log2 = 0;
1714
1715 if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1716 if (max_size == 1) max_size = 2;
1717
1718 while ((1UL << log2) < max_size)
1719 ++log2;
1720
1721 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1722
1723 XPUSHs (ST (0)); 2118 XPUSHs (ST (0));
1724}
1725 2119
1726int get_max_size (JSON *self) 2120int get_max_size (JSON *self)
1727 CODE: 2121 CODE:
1728 RETVAL = DEC_SIZE (self->flags); 2122 RETVAL = self->max_size;
1729 OUTPUT: 2123 OUTPUT:
1730 RETVAL 2124 RETVAL
1731 2125
1732void filter_json_object (JSON *self, SV *cb = &PL_sv_undef) 2126void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
1733 PPCODE: 2127 PPCODE:
… …
1739} 2133}
1740 2134
1741void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef) 2135void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1742 PPCODE: 2136 PPCODE:
1743{ 2137{
1744 if (!self->cb_sk_object) 2138 if (!self->cb_sk_object)
1745 self->cb_sk_object = newHV (); 2139 self->cb_sk_object = newHV ();
1746 2140
1747 if (SvOK (cb)) 2141 if (SvOK (cb))
1748 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0); 2142 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1749 else 2143 else
… …
1760 XPUSHs (ST (0)); 2154 XPUSHs (ST (0));
1761} 2155}
1762 2156
1763void encode (JSON *self, SV *scalar) 2157void encode (JSON *self, SV *scalar)
1764 PPCODE: 2158 PPCODE:
1765 XPUSHs (encode_json (scalar, self)); 2159 PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
2160 XPUSHs (scalar);
1766 2161
1767void decode (JSON *self, SV *jsonstr) 2162void decode (JSON *self, SV *jsonstr)
1768 PPCODE: 2163 PPCODE:
1769 XPUSHs (decode_json (jsonstr, self, 0)); 2164 PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
2165 XPUSHs (jsonstr);
1770 2166
1771void decode_prefix (JSON *self, SV *jsonstr) 2167void decode_prefix (JSON *self, SV *jsonstr)
1772 PPCODE: 2168 PPCODE:
1773{ 2169{
2170 SV *sv;
1774 STRLEN offset; 2171 STRLEN offset;
2172 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1775 EXTEND (SP, 2); 2173 EXTEND (SP, 2);
1776 PUSHs (decode_json (jsonstr, self, &offset)); 2174 PUSHs (sv);
1777 PUSHs (sv_2mortal (newSVuv (offset))); 2175 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, SvPV_nolen (jsonstr) + offset))));
1778} 2176}
1779 2177
1780void incr_parse (JSON *self, SV *jsonstr = 0) 2178void incr_parse (JSON *self, SV *jsonstr = 0)
1781 PPCODE: 2179 PPCODE:
1782{ 2180{
1783 if (!self->incr_text) 2181 if (!self->incr_text)
1784 self->incr_text = newSVpvn ("", 0); 2182 self->incr_text = newSVpvn ("", 0);
2183
2184 /* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
2185 if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
2186 if (DECODE_WANTS_OCTETS (self))
2187 {
2188 if (self->incr_pos)
2189 self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
2190 (U8 *)SvPVX (self->incr_text) + self->incr_pos);
2191
2192 sv_utf8_downgrade (self->incr_text, 0);
2193 }
2194 else
2195 {
2196 sv_utf8_upgrade (self->incr_text);
2197
2198 if (self->incr_pos)
2199 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
2200 - (U8 *)SvPVX (self->incr_text);
2201 }
1785 2202
1786 // append data, if any 2203 // append data, if any
1787 if (jsonstr) 2204 if (jsonstr)
1788 { 2205 {
2206 /* make sure both strings have same encoding */
1789 if (SvUTF8 (jsonstr) && !SvUTF8 (self->incr_text)) 2207 if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
2208 if (SvUTF8 (jsonstr))
2209 sv_utf8_downgrade (jsonstr, 0);
1790 { 2210 else
1791 /* utf-8-ness differs, need to upgrade */
1792 sv_utf8_upgrade (self->incr_text); 2211 sv_utf8_upgrade (jsonstr);
1793 2212
1794 if (self->incr_pos) 2213 /* and then just blindly append */
1795 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1796 - (U8 *)SvPVX (self->incr_text);
1797 }
1798
1799 { 2214 {
1800 STRLEN len; 2215 STRLEN len;
1801 const char *str = SvPV (jsonstr, len); 2216 const char *str = SvPV (jsonstr, len);
1802 SvGROW (self->incr_text, SvCUR (self->incr_text) + len + 1); 2217 STRLEN cur = SvCUR (self->incr_text);
2218
2219 if (SvLEN (self->incr_text) - cur <= len)
2220 json_sv_grow (self->incr_text, cur, len);
2221
1803 Move (str, SvEND (self->incr_text), len, char); 2222 Move (str, SvEND (self->incr_text), len, char);
1804 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len); 2223 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
1805 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there 2224 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
1806 } 2225 }
1807 } 2226 }
1808 2227
1809 if (GIMME_V != G_VOID) 2228 if (GIMME_V != G_VOID)
1810 do 2229 do
1811 { 2230 {
2231 SV *sv;
1812 STRLEN offset; 2232 STRLEN offset;
1813 2233
1814 if (!INCR_DONE (self)) 2234 if (!INCR_DONE (self))
1815 { 2235 {
1816 incr_parse (self); 2236 incr_parse (self);
2237
2238 if (self->incr_pos > self->max_size && self->max_size)
2239 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
2240 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
2241
1817 if (!INCR_DONE (self)) 2242 if (!INCR_DONE (self))
2243 {
2244 // as an optimisation, do not accumulate white space in the incr buffer
2245 if (self->incr_mode == INCR_M_WS && self->incr_pos)
2246 {
2247 self->incr_pos = 0;
2248 SvCUR_set (self->incr_text, 0);
2249 }
2250
1818 break; 2251 break;
2252 }
1819 } 2253 }
1820 2254
1821 XPUSHs (decode_json (self->incr_text, self, &offset)); 2255 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2256 XPUSHs (sv);
1822 2257
1823 sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + offset);
1824 self->incr_pos -= offset; 2258 self->incr_pos -= offset;
1825 self->incr_nest = 0; 2259 self->incr_nest = 0;
1826 self->incr_mode = 0; 2260 self->incr_mode = 0;
2261
2262 sv_chop (self->incr_text, SvPVX (self->incr_text) + offset);
1827 } 2263 }
1828 while (GIMME_V == G_ARRAY); 2264 while (GIMME_V == G_ARRAY);
1829} 2265}
1830 2266
1831SV *incr_text (JSON *self) 2267SV *incr_text (JSON *self)
… …
1850 self->incr_nest = 0; 2286 self->incr_nest = 0;
1851 self->incr_mode = 0; 2287 self->incr_mode = 0;
1852 } 2288 }
1853} 2289}
1854 2290
2291void incr_reset (JSON *self)
2292 CODE:
2293{
2294 SvREFCNT_dec (self->incr_text);
2295 self->incr_text = 0;
2296 self->incr_pos = 0;
2297 self->incr_nest = 0;
2298 self->incr_mode = 0;
2299}
2300
1855void DESTROY (JSON *self) 2301void DESTROY (JSON *self)
1856 CODE: 2302 CODE:
2303 SvREFCNT_dec (self->v_false);
2304 SvREFCNT_dec (self->v_true);
1857 SvREFCNT_dec (self->cb_sk_object); 2305 SvREFCNT_dec (self->cb_sk_object);
1858 SvREFCNT_dec (self->cb_object); 2306 SvREFCNT_dec (self->cb_object);
1859 SvREFCNT_dec (self->incr_text); 2307 SvREFCNT_dec (self->incr_text);
1860 2308
1861PROTOTYPES: ENABLE 2309PROTOTYPES: ENABLE
1862 2310
1863void encode_json (SV *scalar) 2311void encode_json (SV *scalar)
1864 ALIAS:
1865 to_json_ = 0
1866 encode_json = F_UTF8
1867 PPCODE: 2312 PPCODE:
1868{ 2313{
1869 JSON json = { F_DEFAULT | ix }; 2314 JSON json;
1870 XPUSHs (encode_json (scalar, &json)); 2315 json_init (&json);
2316 json.flags |= F_UTF8;
2317 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2318 XPUSHs (scalar);
1871} 2319}
1872 2320
1873void decode_json (SV *jsonstr) 2321void decode_json (SV *jsonstr)
1874 ALIAS:
1875 from_json_ = 0
1876 decode_json = F_UTF8
1877 PPCODE: 2322 PPCODE:
1878{ 2323{
1879 JSON json = { F_DEFAULT | ix }; 2324 JSON json;
1880 XPUSHs (decode_json (jsonstr, &json, 0)); 2325 json_init (&json);
2326 json.flags |= F_UTF8;
2327 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2328 XPUSHs (jsonstr);
1881} 2329}
1882 2330
1883

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines