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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines