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.80 by root, Wed Mar 26 01:32:53 2008 UTC vs.
Revision 1.117 by root, Fri Oct 25 20:19:57 2013 UTC

12#if defined(__BORLANDC__) || defined(_MSC_VER) 12#if defined(__BORLANDC__) || defined(_MSC_VER)
13# define snprintf _snprintf // C compilers have this in stdio.h 13# define snprintf _snprintf // C compilers have this in stdio.h
14#endif 14#endif
15 15
16// some old perls do not have this, try to make it work, no 16// 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. 17// guarantees, though. if it breaks, you get to keep the pieces.
18#ifndef UTF8_MAXBYTES 18#ifndef UTF8_MAXBYTES
19# define UTF8_MAXBYTES 13 19# define UTF8_MAXBYTES 13
20#endif 20#endif
21 21
22// three extra for rounding, sign, and end of string
22#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 2) 23#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3)
23 24
24#define F_ASCII 0x00000001UL 25#define F_ASCII 0x00000001UL
25#define F_LATIN1 0x00000002UL 26#define F_LATIN1 0x00000002UL
26#define F_UTF8 0x00000004UL 27#define F_UTF8 0x00000004UL
27#define F_INDENT 0x00000008UL 28#define F_INDENT 0x00000008UL
31#define F_ALLOW_NONREF 0x00000100UL 32#define F_ALLOW_NONREF 0x00000100UL
32#define F_SHRINK 0x00000200UL 33#define F_SHRINK 0x00000200UL
33#define F_ALLOW_BLESSED 0x00000400UL 34#define F_ALLOW_BLESSED 0x00000400UL
34#define F_CONV_BLESSED 0x00000800UL 35#define F_CONV_BLESSED 0x00000800UL
35#define F_RELAXED 0x00001000UL 36#define F_RELAXED 0x00001000UL
36 37#define F_ALLOW_UNKNOWN 0x00002000UL
37#define F_MAXDEPTH 0xf8000000UL
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 38#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
42 39
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 40#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
47#define F_DEFAULT (9UL << S_MAXDEPTH)
48 41
49#define INIT_SIZE 32 // initial scalar size to be allocated 42#define INIT_SIZE 32 // initial scalar size to be allocated
50#define INDENT_STEP 3 // spaces per indentation level 43#define INDENT_STEP 3 // spaces per indentation level
51 44
52#define SHORT_STRING_LEN 16384 // special-case strings of up to this size 45#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
46
47#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8)
53 48
54#define SB do { 49#define SB do {
55#define SE } while (0) 50#define SE } while (0)
56 51
57#if __GNUC__ >= 3 52#if __GNUC__ >= 3
67 62
68#define IN_RANGE_INC(type,val,beg,end) \ 63#define IN_RANGE_INC(type,val,beg,end) \
69 ((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \ 64 ((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \
70 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg))) 65 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
71 66
67#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"
68
72#ifdef USE_ITHREADS 69#ifdef USE_ITHREADS
73# define JSON_SLOW 1 70# define JSON_SLOW 1
74# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1)) 71# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
75#else 72#else
76# define JSON_SLOW 0 73# define JSON_SLOW 0
77# define JSON_STASH json_stash 74# define JSON_STASH json_stash
78#endif 75#endif
79 76
77// the amount of HEs to allocate on the stack, when sorting keys
78#define STACK_HES 64
79
80static HV *json_stash, *json_boolean_stash; // JSON::XS:: 80static HV *json_stash, *json_boolean_stash; // JSON::XS::
81static SV *json_true, *json_false; 81static SV *json_true, *json_false;
82 82
83enum { 83enum {
84 INCR_M_WS = 0, // initial whitespace skipping, must be 0 84 INCR_M_WS = 0, // initial whitespace skipping, must be 0
85 INCR_M_STR, // inside string 85 INCR_M_STR, // inside string
86 INCR_M_BS, // inside backslash 86 INCR_M_BS, // inside backslash
87 INCR_M_C0, // inside comment in initial whitespace sequence
88 INCR_M_C1, // inside comment in other places
87 INCR_M_JSON // outside anything, count nesting 89 INCR_M_JSON // outside anything, count nesting
88}; 90};
89 91
90#define INCR_DONE(json) (!(json)->incr_nest && (json)->incr_mode == INCR_M_JSON) 92#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
91 93
92typedef struct { 94typedef struct {
93 U32 flags; 95 U32 flags;
96 U32 max_depth;
97 STRLEN max_size;
98
94 SV *cb_object; 99 SV *cb_object;
95 HV *cb_sk_object; 100 HV *cb_sk_object;
96 101
97 // for the incremental parser 102 // for the incremental parser
98 SV *incr_text; // the source text so far 103 SV *incr_text; // the source text so far
99 STRLEN incr_pos; // the current offset into the text 104 STRLEN incr_pos; // the current offset into the text
100 int incr_nest; // {[]}-nesting level 105 int incr_nest; // {[]}-nesting level
101 int incr_mode; 106 unsigned char incr_mode;
102} JSON; 107} JSON;
108
109INLINE void
110json_init (JSON *json)
111{
112 Zero (json, 1, JSON);
113 json->max_depth = 512;
114}
103 115
104///////////////////////////////////////////////////////////////////////////// 116/////////////////////////////////////////////////////////////////////////////
105// utility functions 117// utility functions
106 118
119INLINE SV *
120get_bool (const char *name)
121{
122 SV *sv = get_sv (name, 1);
123
124 SvREADONLY_on (sv);
125 SvREADONLY_on (SvRV (sv));
126
127 return sv;
128}
129
107INLINE void 130INLINE void
108shrink (SV *sv) 131shrink (SV *sv)
109{ 132{
110 sv_utf8_downgrade (sv, 1); 133 sv_utf8_downgrade (sv, 1);
134
111 if (SvLEN (sv) > SvCUR (sv) + 1) 135 if (SvLEN (sv) > SvCUR (sv) + 1)
112 { 136 {
113#ifdef SvPV_shrink_to_cur 137#ifdef SvPV_shrink_to_cur
114 SvPV_shrink_to_cur (sv); 138 SvPV_shrink_to_cur (sv);
115#elif defined (SvPV_renew) 139#elif defined (SvPV_renew)
159 *s++ = 0x80 | ( ch & 0x3f); 183 *s++ = 0x80 | ( ch & 0x3f);
160 184
161 return s; 185 return s;
162} 186}
163 187
188// convert offset pointer to character index, sv must be string
189static STRLEN
190ptr_to_index (SV *sv, char *offset)
191{
192 return SvUTF8 (sv)
193 ? utf8_distance (offset, SvPVX (sv))
194 : offset - SvPVX (sv);
195}
196
197/////////////////////////////////////////////////////////////////////////////
198// fp hell
199
200// scan a group of digits, and a trailing exponent
201static void
202json_atof_scan1 (const char *s, NV *accum, int *expo, int postdp, int maxdepth)
203{
204 UV uaccum = 0;
205 int eaccum = 0;
206
207 // if we recurse too deep, skip all remaining digits
208 // to avoid a stack overflow attack
209 if (expect_false (--maxdepth <= 0))
210 while (((U8)*s - '0') < 10)
211 ++s;
212
213 for (;;)
214 {
215 U8 dig = (U8)*s - '0';
216
217 if (expect_false (dig >= 10))
218 {
219 if (dig == (U8)((U8)'.' - (U8)'0'))
220 {
221 ++s;
222 json_atof_scan1 (s, accum, expo, 1, maxdepth);
223 }
224 else if ((dig | ' ') == 'e' - '0')
225 {
226 int exp2 = 0;
227 int neg = 0;
228
229 ++s;
230
231 if (*s == '-')
232 {
233 ++s;
234 neg = 1;
235 }
236 else if (*s == '+')
237 ++s;
238
239 while ((dig = (U8)*s - '0') < 10)
240 exp2 = exp2 * 10 + *s++ - '0';
241
242 *expo += neg ? -exp2 : exp2;
243 }
244
245 break;
246 }
247
248 ++s;
249
250 uaccum = uaccum * 10 + dig;
251 ++eaccum;
252
253 // if we have too many digits, then recurse for more
254 // we actually do this for rather few digits
255 if (uaccum >= (UV_MAX - 9) / 10)
256 {
257 if (postdp) *expo -= eaccum;
258 json_atof_scan1 (s, accum, expo, postdp, maxdepth);
259 if (postdp) *expo += eaccum;
260
261 break;
262 }
263 }
264
265 // this relies greatly on the quality of the pow ()
266 // implementation of the platform, but a good
267 // implementation is hard to beat.
268 // (IEEE 754 conformant ones are required to be exact)
269 if (postdp) *expo -= eaccum;
270 *accum += uaccum * Perl_pow (10., *expo);
271 *expo += eaccum;
272}
273
274static NV
275json_atof (const char *s)
276{
277 NV accum = 0.;
278 int expo = 0;
279 int neg = 0;
280
281 if (*s == '-')
282 {
283 ++s;
284 neg = 1;
285 }
286
287 // a recursion depth of ten gives us >>500 bits
288 json_atof_scan1 (s, &accum, &expo, 0, 10);
289
290 return neg ? -accum : accum;
291}
164///////////////////////////////////////////////////////////////////////////// 292/////////////////////////////////////////////////////////////////////////////
165// encoder 293// encoder
166 294
167// structure used for encoding JSON 295// structure used for encoding JSON
168typedef struct 296typedef struct
170 char *cur; // SvPVX (sv) + current output position 298 char *cur; // SvPVX (sv) + current output position
171 char *end; // SvEND (sv) 299 char *end; // SvEND (sv)
172 SV *sv; // result scalar 300 SV *sv; // result scalar
173 JSON json; 301 JSON json;
174 U32 indent; // indentation level 302 U32 indent; // indentation level
175 U32 maxdepth; // max. indentation/recursion level
176 UV limit; // escape character values >= this value when encoding 303 UV limit; // escape character values >= this value when encoding
177} enc_t; 304} enc_t;
178 305
179INLINE void 306INLINE void
180need (enc_t *enc, STRLEN len) 307need (enc_t *enc, STRLEN len)
181{ 308{
182 if (expect_false (enc->cur + len >= enc->end)) 309 if (expect_false (enc->cur + len >= enc->end))
183 { 310 {
184 STRLEN cur = enc->cur - SvPVX (enc->sv); 311 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
185 SvGROW (enc->sv, cur + len + 1); 312 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
186 enc->cur = SvPVX (enc->sv) + cur; 313 enc->cur = SvPVX (enc->sv) + cur;
187 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 314 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
188 } 315 }
189} 316}
190 317
265 (int)((uch - 0x10000) % 0x400 + 0xDC00)); 392 (int)((uch - 0x10000) % 0x400 + 0xDC00));
266 enc->cur += 12; 393 enc->cur += 12;
267 } 394 }
268 else 395 else
269 { 396 {
270 static char hexdigit [16] = "0123456789abcdef";
271 need (enc, len += 5); 397 need (enc, len += 5);
272 *enc->cur++ = '\\'; 398 *enc->cur++ = '\\';
273 *enc->cur++ = 'u'; 399 *enc->cur++ = 'u';
274 *enc->cur++ = hexdigit [ uch >> 12 ]; 400 *enc->cur++ = PL_hexdigit [ uch >> 12 ];
275 *enc->cur++ = hexdigit [(uch >> 8) & 15]; 401 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
276 *enc->cur++ = hexdigit [(uch >> 4) & 15]; 402 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
277 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 403 *enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
278 } 404 }
279 405
280 str += clen; 406 str += clen;
281 } 407 }
282 else if (enc->json.flags & F_LATIN1) 408 else if (enc->json.flags & F_LATIN1)
353static void 479static void
354encode_av (enc_t *enc, AV *av) 480encode_av (enc_t *enc, AV *av)
355{ 481{
356 int i, len = av_len (av); 482 int i, len = av_len (av);
357 483
358 if (enc->indent >= enc->maxdepth) 484 if (enc->indent >= enc->json.max_depth)
359 croak ("data structure too deep (hit recursion limit)"); 485 croak (ERR_NESTING_EXCEEDED);
360 486
361 encode_ch (enc, '['); 487 encode_ch (enc, '[');
362 488
363 if (len >= 0) 489 if (len >= 0)
364 { 490 {
365 encode_nl (enc); ++enc->indent; 491 encode_nl (enc); ++enc->indent;
366 492
367 for (i = 0; i <= len; ++i) 493 for (i = 0; i <= len; ++i)
379 encode_comma (enc); 505 encode_comma (enc);
380 } 506 }
381 507
382 encode_nl (enc); --enc->indent; encode_indent (enc); 508 encode_nl (enc); --enc->indent; encode_indent (enc);
383 } 509 }
384 510
385 encode_ch (enc, ']'); 511 encode_ch (enc, ']');
386} 512}
387 513
388static void 514static void
389encode_hk (enc_t *enc, HE *he) 515encode_hk (enc_t *enc, HE *he)
393 if (HeKLEN (he) == HEf_SVKEY) 519 if (HeKLEN (he) == HEf_SVKEY)
394 { 520 {
395 SV *sv = HeSVKEY (he); 521 SV *sv = HeSVKEY (he);
396 STRLEN len; 522 STRLEN len;
397 char *str; 523 char *str;
398 524
399 SvGETMAGIC (sv); 525 SvGETMAGIC (sv);
400 str = SvPV (sv, len); 526 str = SvPV (sv, len);
401 527
402 encode_str (enc, str, len, SvUTF8 (sv)); 528 encode_str (enc, str, len, SvUTF8 (sv));
403 } 529 }
439static void 565static void
440encode_hv (enc_t *enc, HV *hv) 566encode_hv (enc_t *enc, HV *hv)
441{ 567{
442 HE *he; 568 HE *he;
443 569
444 if (enc->indent >= enc->maxdepth) 570 if (enc->indent >= enc->json.max_depth)
445 croak ("data structure too deep (hit recursion limit)"); 571 croak (ERR_NESTING_EXCEEDED);
446 572
447 encode_ch (enc, '{'); 573 encode_ch (enc, '{');
448 574
449 // for canonical output we have to sort by keys first 575 // for canonical output we have to sort by keys first
450 // actually, this is mostly due to the stupid so-called 576 // actually, this is mostly due to the stupid so-called
451 // security workaround added somewhere in 5.8.x. 577 // security workaround added somewhere in 5.8.x
452 // that randomises hash orderings 578 // that randomises hash orderings
453 if (enc->json.flags & F_CANONICAL) 579 if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
454 { 580 {
455 int count = hv_iterinit (hv); 581 int count = hv_iterinit (hv);
456 582
457 if (SvMAGICAL (hv)) 583 if (SvMAGICAL (hv))
458 { 584 {
469 } 595 }
470 596
471 if (count) 597 if (count)
472 { 598 {
473 int i, fast = 1; 599 int i, fast = 1;
474#if defined(__BORLANDC__) || defined(_MSC_VER) 600 HE *hes_stack [STACK_HES];
475 HE **hes = _alloca (count * sizeof (HE)); 601 HE **hes = hes_stack;
476#else 602
477 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 603 // allocate larger arrays on the heap
478#endif 604 if (count > STACK_HES)
605 {
606 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes)));
607 hes = (HE **)SvPVX (sv);
608 }
479 609
480 i = 0; 610 i = 0;
481 while ((he = hv_iternext (hv))) 611 while ((he = hv_iternext (hv)))
482 { 612 {
483 hes [i++] = he; 613 hes [i++] = he;
631 761
632 if (len == 1 && *pv == '1') 762 if (len == 1 && *pv == '1')
633 encode_str (enc, "true", 4, 0); 763 encode_str (enc, "true", 4, 0);
634 else if (len == 1 && *pv == '0') 764 else if (len == 1 && *pv == '0')
635 encode_str (enc, "false", 5, 0); 765 encode_str (enc, "false", 5, 0);
766 else if (enc->json.flags & F_ALLOW_UNKNOWN)
767 encode_str (enc, "null", 4, 0);
636 else 768 else
637 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 769 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
638 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 770 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
639 } 771 }
772 else if (enc->json.flags & F_ALLOW_UNKNOWN)
773 encode_str (enc, "null", 4, 0);
640 else 774 else
641 croak ("encountered %s, but JSON can only represent references to arrays or hashes", 775 croak ("encountered %s, but JSON can only represent references to arrays or hashes",
642 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 776 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
643} 777}
644 778
698 } 832 }
699 else 833 else
700 { 834 {
701 // large integer, use the (rather slow) snprintf way. 835 // large integer, use the (rather slow) snprintf way.
702 need (enc, IVUV_MAXCHARS); 836 need (enc, IVUV_MAXCHARS);
703 enc->cur += 837 enc->cur +=
704 SvIsUV(sv) 838 SvIsUV(sv)
705 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv)) 839 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
706 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv)); 840 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
707 } 841 }
708 } 842 }
709 else if (SvROK (sv)) 843 else if (SvROK (sv))
710 encode_rv (enc, SvRV (sv)); 844 encode_rv (enc, SvRV (sv));
711 else if (!SvOK (sv)) 845 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
712 encode_str (enc, "null", 4, 0); 846 encode_str (enc, "null", 4, 0);
713 else 847 else
714 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 848 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, check your input data",
715 SvPV_nolen (sv), SvFLAGS (sv)); 849 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
716} 850}
717 851
718static SV * 852static SV *
719encode_json (SV *scalar, JSON *json) 853encode_json (SV *scalar, JSON *json)
720{ 854{
726 enc.json = *json; 860 enc.json = *json;
727 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 861 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
728 enc.cur = SvPVX (enc.sv); 862 enc.cur = SvPVX (enc.sv);
729 enc.end = SvEND (enc.sv); 863 enc.end = SvEND (enc.sv);
730 enc.indent = 0; 864 enc.indent = 0;
731 enc.maxdepth = DEC_DEPTH (enc.json.flags);
732 enc.limit = enc.json.flags & F_ASCII ? 0x000080UL 865 enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
733 : enc.json.flags & F_LATIN1 ? 0x000100UL 866 : enc.json.flags & F_LATIN1 ? 0x000100UL
734 : 0x110000UL; 867 : 0x110000UL;
735 868
736 SvPOK_only (enc.sv); 869 SvPOK_only (enc.sv);
737 encode_sv (&enc, scalar); 870 encode_sv (&enc, scalar);
871 encode_nl (&enc);
738 872
739 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 873 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
740 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 874 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
741 875
742 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8))) 876 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
803 if (*dec->cur != ch) \ 937 if (*dec->cur != ch) \
804 ERR (# ch " expected"); \ 938 ERR (# ch " expected"); \
805 ++dec->cur; \ 939 ++dec->cur; \
806 SE 940 SE
807 941
808#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)") 942#define DEC_INC_DEPTH if (++dec->depth > dec->json.max_depth) ERR (ERR_NESTING_EXCEEDED)
809#define DEC_DEC_DEPTH --dec->depth 943#define DEC_DEC_DEPTH --dec->depth
810 944
811static SV *decode_sv (dec_t *dec); 945static SV *decode_sv (dec_t *dec);
812 946
813static signed char decode_hexdigit[256]; 947static signed char decode_hexdigit[256];
922 else if (expect_true (ch >= 0x20 && ch < 0x80)) 1056 else if (expect_true (ch >= 0x20 && ch < 0x80))
923 *cur++ = ch; 1057 *cur++ = ch;
924 else if (ch >= 0x80) 1058 else if (ch >= 0x80)
925 { 1059 {
926 STRLEN clen; 1060 STRLEN clen;
927 UV uch;
928 1061
929 --dec_cur; 1062 --dec_cur;
930 1063
931 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen); 1064 decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
932 if (clen == (STRLEN)-1) 1065 if (clen == (STRLEN)-1)
933 ERR ("malformed UTF-8 character in JSON string"); 1066 ERR ("malformed UTF-8 character in JSON string");
934 1067
935 do 1068 do
936 *cur++ = *dec_cur++; 1069 *cur++ = *dec_cur++;
953 { 1086 {
954 STRLEN len = cur - buf; 1087 STRLEN len = cur - buf;
955 1088
956 if (sv) 1089 if (sv)
957 { 1090 {
958 SvGROW (sv, SvCUR (sv) + len + 1); 1091 STRLEN cur = SvCUR (sv);
1092
1093 if (SvLEN (sv) <= cur + len)
1094 SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
1095
959 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 1096 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
960 SvCUR_set (sv, SvCUR (sv) + len); 1097 SvCUR_set (sv, SvCUR (sv) + len);
961 } 1098 }
962 else 1099 else
963 sv = newSVpvn (buf, len); 1100 sv = newSVpvn (buf, len);
1054 1191
1055 // special case the rather common 1..5-digit-int case 1192 // special case the rather common 1..5-digit-int case
1056 if (*start == '-') 1193 if (*start == '-')
1057 switch (len) 1194 switch (len)
1058 { 1195 {
1059 case 2: return newSViv (-( start [1] - '0' * 1)); 1196 case 2: return newSViv (-(IV)( start [1] - '0' * 1));
1060 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11)); 1197 case 3: return newSViv (-(IV)( start [1] * 10 + start [2] - '0' * 11));
1061 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111)); 1198 case 4: return newSViv (-(IV)( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
1062 case 5: return newSViv (-( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111)); 1199 case 5: return newSViv (-(IV)( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
1063 case 6: return newSViv (-(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111)); 1200 case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
1064 } 1201 }
1065 else 1202 else
1066 switch (len) 1203 switch (len)
1067 { 1204 {
1068 case 1: return newSViv ( start [0] - '0' * 1); 1205 case 1: return newSViv ( start [0] - '0' * 1);
1069 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11); 1206 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
1070 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111); 1207 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
1071 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111); 1208 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
1072 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111); 1209 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
1073 } 1210 }
1074 1211
1075 { 1212 {
1076 UV uv; 1213 UV uv;
1077 int numtype = grok_number (start, len, &uv); 1214 int numtype = grok_number (start, len, &uv);
1086 } 1223 }
1087 1224
1088 len -= *start == '-' ? 1 : 0; 1225 len -= *start == '-' ? 1 : 0;
1089 1226
1090 // does not fit into IV or UV, try NV 1227 // does not fit into IV or UV, try NV
1091 if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len) 1228 if (len <= NV_DIG)
1092 #if defined (LDBL_DIG)
1093 || (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
1094 #endif
1095 )
1096 // fits into NV without loss of precision 1229 // fits into NV without loss of precision
1097 return newSVnv (Atof (start)); 1230 return newSVnv (json_atof (start));
1098 1231
1099 // everything else fails, convert it to a string 1232 // everything else fails, convert it to a string
1100 return newSVpvn (start, dec->cur - start); 1233 return newSVpvn (start, dec->cur - start);
1101 } 1234 }
1102 1235
1103 // loss of precision here 1236 // loss of precision here
1104 return newSVnv (Atof (start)); 1237 return newSVnv (json_atof (start));
1105 1238
1106fail: 1239fail:
1107 return 0; 1240 return 0;
1108} 1241}
1109 1242
1133 if (*dec->cur == ']') 1266 if (*dec->cur == ']')
1134 { 1267 {
1135 ++dec->cur; 1268 ++dec->cur;
1136 break; 1269 break;
1137 } 1270 }
1138 1271
1139 if (*dec->cur != ',') 1272 if (*dec->cur != ',')
1140 ERR (", or ] expected while parsing array"); 1273 ERR (", or ] expected while parsing array");
1141 1274
1142 ++dec->cur; 1275 ++dec->cur;
1143 1276
1278 dSP; 1411 dSP;
1279 int count; 1412 int count;
1280 1413
1281 ENTER; SAVETMPS; PUSHMARK (SP); 1414 ENTER; SAVETMPS; PUSHMARK (SP);
1282 XPUSHs (HeVAL (he)); 1415 XPUSHs (HeVAL (he));
1416 sv_2mortal (sv);
1283 1417
1284 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1418 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1285 1419
1286 if (count == 1) 1420 if (count == 1)
1287 { 1421 {
1288 sv = newSVsv (POPs); 1422 sv = newSVsv (POPs);
1289 FREETMPS; LEAVE; 1423 FREETMPS; LEAVE;
1290 return sv; 1424 return sv;
1291 } 1425 }
1292 1426
1427 SvREFCNT_inc (sv);
1293 FREETMPS; LEAVE; 1428 FREETMPS; LEAVE;
1294 } 1429 }
1295 } 1430 }
1296 1431
1297 if (dec->json.cb_object) 1432 if (dec->json.cb_object)
1329{ 1464{
1330 // the beauty of JSON: you need exactly one character lookahead 1465 // the beauty of JSON: you need exactly one character lookahead
1331 // to parse everything. 1466 // to parse everything.
1332 switch (*dec->cur) 1467 switch (*dec->cur)
1333 { 1468 {
1334 case '"': ++dec->cur; return decode_str (dec); 1469 case '"': ++dec->cur; return decode_str (dec);
1335 case '[': ++dec->cur; return decode_av (dec); 1470 case '[': ++dec->cur; return decode_av (dec);
1336 case '{': ++dec->cur; return decode_hv (dec); 1471 case '{': ++dec->cur; return decode_hv (dec);
1337 1472
1338 case '-': 1473 case '-':
1339 case '0': case '1': case '2': case '3': case '4': 1474 case '0': case '1': case '2': case '3': case '4':
1340 case '5': case '6': case '7': case '8': case '9': 1475 case '5': case '6': case '7': case '8': case '9':
1343 case 't': 1478 case 't':
1344 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1479 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1345 { 1480 {
1346 dec->cur += 4; 1481 dec->cur += 4;
1347#if JSON_SLOW 1482#if JSON_SLOW
1348 json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true); 1483 json_true = get_bool ("JSON::XS::true");
1349#endif 1484#endif
1350 return SvREFCNT_inc (json_true); 1485 return newSVsv (json_true);
1351 } 1486 }
1352 else 1487 else
1353 ERR ("'true' expected"); 1488 ERR ("'true' expected");
1354 1489
1355 break; 1490 break;
1357 case 'f': 1492 case 'f':
1358 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1493 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1359 { 1494 {
1360 dec->cur += 5; 1495 dec->cur += 5;
1361#if JSON_SLOW 1496#if JSON_SLOW
1362 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false); 1497 json_false = get_bool ("JSON::XS::false");
1363#endif 1498#endif
1364 return SvREFCNT_inc (json_false); 1499 return newSVsv (json_false);
1365 } 1500 }
1366 else 1501 else
1367 ERR ("'false' expected"); 1502 ERR ("'false' expected");
1368 1503
1369 break; 1504 break;
1387fail: 1522fail:
1388 return 0; 1523 return 0;
1389} 1524}
1390 1525
1391static SV * 1526static SV *
1392decode_json (SV *string, JSON *json, STRLEN *offset_return) 1527decode_json (SV *string, JSON *json, char **offset_return)
1393{ 1528{
1394 dec_t dec; 1529 dec_t dec;
1395 STRLEN offset;
1396 SV *sv; 1530 SV *sv;
1397 1531
1532 /* work around bugs in 5.10 where manipulating magic values
1533 * makes perl ignore the magic in subsequent accesses.
1534 * also make a copy of non-PV values, to get them into a clean
1535 * state (SvPV should do that, but it's buggy, see below).
1536 */
1398 SvGETMAGIC (string); 1537 /*SvGETMAGIC (string);*/
1538 if (SvMAGICAL (string) || !SvPOK (string))
1539 string = sv_2mortal (newSVsv (string));
1540
1399 SvUPGRADE (string, SVt_PV); 1541 SvUPGRADE (string, SVt_PV);
1400 1542
1401 if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags)) 1543 /* work around a bug in perl 5.10, which causes SvCUR to fail an
1544 * assertion with -DDEBUGGING, although SvCUR is documented to
1545 * return the xpv_cur field which certainly exists after upgrading.
1546 * according to nicholas clark, calling SvPOK fixes this.
1547 * But it doesn't fix it, so try another workaround, call SvPV_nolen
1548 * and hope for the best.
1549 * Damnit, SvPV_nolen still trips over yet another assertion. This
1550 * assertion business is seriously broken, try yet another workaround
1551 * for the broken -DDEBUGGING.
1552 */
1553 {
1554#ifdef DEBUGGING
1555 STRLEN offset = SvOK (string) ? sv_len (string) : 0;
1556#else
1557 STRLEN offset = SvCUR (string);
1558#endif
1559
1560 if (offset > json->max_size && json->max_size)
1402 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 1561 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1403 (unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags)); 1562 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1563 }
1404 1564
1405 if (json->flags & F_UTF8) 1565 if (DECODE_WANTS_OCTETS (json))
1406 sv_utf8_downgrade (string, 0); 1566 sv_utf8_downgrade (string, 0);
1407 else 1567 else
1408 sv_utf8_upgrade (string); 1568 sv_utf8_upgrade (string);
1409 1569
1410 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1570 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1411 1571
1412 dec.json = *json; 1572 dec.json = *json;
1413 dec.cur = SvPVX (string); 1573 dec.cur = SvPVX (string);
1414 dec.end = SvEND (string); 1574 dec.end = SvEND (string);
1415 dec.err = 0; 1575 dec.err = 0;
1416 dec.depth = 0; 1576 dec.depth = 0;
1417 dec.maxdepth = DEC_DEPTH (dec.json.flags);
1418 1577
1419 if (dec.json.cb_object || dec.json.cb_sk_object) 1578 if (dec.json.cb_object || dec.json.cb_sk_object)
1420 dec.json.flags |= F_HOOK; 1579 dec.json.flags |= F_HOOK;
1421 1580
1422 *dec.end = 0; // this should basically be a nop, too, but make sure it's there 1581 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1423 1582
1424 decode_ws (&dec); 1583 decode_ws (&dec);
1425 sv = decode_sv (&dec); 1584 sv = decode_sv (&dec);
1585
1586 if (offset_return)
1587 *offset_return = dec.cur;
1426 1588
1427 if (!(offset_return || !sv)) 1589 if (!(offset_return || !sv))
1428 { 1590 {
1429 // check for trailing garbage 1591 // check for trailing garbage
1430 decode_ws (&dec); 1592 decode_ws (&dec);
1433 { 1595 {
1434 dec.err = "garbage after JSON object"; 1596 dec.err = "garbage after JSON object";
1435 SvREFCNT_dec (sv); 1597 SvREFCNT_dec (sv);
1436 sv = 0; 1598 sv = 0;
1437 } 1599 }
1438 }
1439
1440 if (offset_return || !sv)
1441 {
1442 offset = dec.json.flags & F_UTF8
1443 ? dec.cur - SvPVX (string)
1444 : utf8_distance (dec.cur, SvPVX (string));
1445
1446 if (offset_return)
1447 *offset_return = offset;
1448 } 1600 }
1449 1601
1450 if (!sv) 1602 if (!sv)
1451 { 1603 {
1452 SV *uni = sv_newmortal (); 1604 SV *uni = sv_newmortal ();
1458 SAVEVPTR (PL_curcop); 1610 SAVEVPTR (PL_curcop);
1459 PL_curcop = &cop; 1611 PL_curcop = &cop;
1460 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1612 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1461 LEAVE; 1613 LEAVE;
1462 1614
1463 croak ("%s, at character offset %d [\"%s\"]", 1615 croak ("%s, at character offset %d (before \"%s\")",
1464 dec.err, 1616 dec.err,
1465 (int)offset, 1617 (int)ptr_to_index (string, dec.cur),
1466 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1618 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1467 } 1619 }
1468 1620
1469 sv = sv_2mortal (sv); 1621 sv = sv_2mortal (sv);
1470 1622
1479 1631
1480static void 1632static void
1481incr_parse (JSON *self) 1633incr_parse (JSON *self)
1482{ 1634{
1483 const char *p = SvPVX (self->incr_text) + self->incr_pos; 1635 const char *p = SvPVX (self->incr_text) + self->incr_pos;
1636
1637 // the state machine here is a bit convoluted and could be simplified a lot
1638 // but this would make it slower, so...
1484 1639
1485 for (;;) 1640 for (;;)
1486 { 1641 {
1487 //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 1642 //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
1488 switch (self->incr_mode) 1643 switch (self->incr_mode)
1489 { 1644 {
1490 // only used for intiial whitespace skipping 1645 // only used for initial whitespace skipping
1491 case INCR_M_WS: 1646 case INCR_M_WS:
1492 for (;;) 1647 for (;;)
1493 { 1648 {
1494 if (*p > 0x20) 1649 if (*p > 0x20)
1495 { 1650 {
1651 if (*p == '#')
1652 {
1653 self->incr_mode = INCR_M_C0;
1654 goto incr_m_c;
1655 }
1656 else
1657 {
1496 self->incr_mode = INCR_M_JSON; 1658 self->incr_mode = INCR_M_JSON;
1497 goto incr_m_json; 1659 goto incr_m_json;
1660 }
1498 } 1661 }
1499 else if (!*p) 1662 else if (!*p)
1500 goto interrupt; 1663 goto interrupt;
1501 1664
1502 ++p; 1665 ++p;
1508 goto interrupt; 1671 goto interrupt;
1509 1672
1510 ++p; 1673 ++p;
1511 self->incr_mode = INCR_M_STR; 1674 self->incr_mode = INCR_M_STR;
1512 goto incr_m_str; 1675 goto incr_m_str;
1676
1677 // inside #-style comments
1678 case INCR_M_C0:
1679 case INCR_M_C1:
1680 incr_m_c:
1681 for (;;)
1682 {
1683 if (*p == '\n')
1684 {
1685 self->incr_mode = self->incr_mode == INCR_M_C0 ? INCR_M_WS : INCR_M_JSON;
1686 break;
1687 }
1688 else if (!*p)
1689 goto interrupt;
1690
1691 ++p;
1692 }
1693
1694 break;
1513 1695
1514 // inside a string 1696 // inside a string
1515 case INCR_M_STR: 1697 case INCR_M_STR:
1516 incr_m_str: 1698 incr_m_str:
1517 for (;;) 1699 for (;;)
1568 self->incr_mode = INCR_M_STR; 1750 self->incr_mode = INCR_M_STR;
1569 goto incr_m_str; 1751 goto incr_m_str;
1570 1752
1571 case '[': 1753 case '[':
1572 case '{': 1754 case '{':
1573 ++self->incr_nest; 1755 if (++self->incr_nest > self->max_depth)
1756 croak (ERR_NESTING_EXCEEDED);
1574 break; 1757 break;
1575 1758
1576 case ']': 1759 case ']':
1577 case '}': 1760 case '}':
1578 if (!--self->incr_nest) 1761 if (--self->incr_nest <= 0)
1579 goto interrupt; 1762 goto interrupt;
1763 break;
1764
1765 case '#':
1766 self->incr_mode = INCR_M_C1;
1767 goto incr_m_c;
1580 } 1768 }
1581 } 1769 }
1582 } 1770 }
1583 1771
1584 modechange: 1772 modechange:
1585 ; 1773 ;
1586 } 1774 }
1587 1775
1588interrupt: 1776interrupt:
1589 self->incr_pos = p - SvPVX (self->incr_text); 1777 self->incr_pos = p - SvPVX (self->incr_text);
1778 //printf ("interrupt<%.*s>\n", self->incr_pos, SvPVX(self->incr_text));//D
1590 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D 1779 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1591} 1780}
1592 1781
1593///////////////////////////////////////////////////////////////////////////// 1782/////////////////////////////////////////////////////////////////////////////
1594// XS interface functions 1783// XS interface functions
1607 : -1; 1796 : -1;
1608 1797
1609 json_stash = gv_stashpv ("JSON::XS" , 1); 1798 json_stash = gv_stashpv ("JSON::XS" , 1);
1610 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1799 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1611 1800
1612 json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true ); 1801 json_true = get_bool ("JSON::XS::true");
1613 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false); 1802 json_false = get_bool ("JSON::XS::false");
1803
1804 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1614} 1805}
1615 1806
1616PROTOTYPES: DISABLE 1807PROTOTYPES: DISABLE
1617 1808
1618void CLONE (...) 1809void CLONE (...)
1621 json_boolean_stash = 0; 1812 json_boolean_stash = 0;
1622 1813
1623void new (char *klass) 1814void new (char *klass)
1624 PPCODE: 1815 PPCODE:
1625{ 1816{
1626 SV *pv = NEWSV (0, sizeof (JSON)); 1817 SV *pv = NEWSV (0, sizeof (JSON));
1627 SvPOK_only (pv); 1818 SvPOK_only (pv);
1628 Zero (SvPVX (pv), 1, JSON); 1819 json_init ((JSON *)SvPVX (pv));
1629 ((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1630 XPUSHs (sv_2mortal (sv_bless ( 1820 XPUSHs (sv_2mortal (sv_bless (
1631 newRV_noinc (pv), 1821 newRV_noinc (pv),
1632 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 1822 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1633 ))); 1823 )));
1634} 1824}
1646 allow_nonref = F_ALLOW_NONREF 1836 allow_nonref = F_ALLOW_NONREF
1647 shrink = F_SHRINK 1837 shrink = F_SHRINK
1648 allow_blessed = F_ALLOW_BLESSED 1838 allow_blessed = F_ALLOW_BLESSED
1649 convert_blessed = F_CONV_BLESSED 1839 convert_blessed = F_CONV_BLESSED
1650 relaxed = F_RELAXED 1840 relaxed = F_RELAXED
1841 allow_unknown = F_ALLOW_UNKNOWN
1651 PPCODE: 1842 PPCODE:
1652{ 1843{
1653 if (enable) 1844 if (enable)
1654 self->flags |= ix; 1845 self->flags |= ix;
1655 else 1846 else
1670 get_allow_nonref = F_ALLOW_NONREF 1861 get_allow_nonref = F_ALLOW_NONREF
1671 get_shrink = F_SHRINK 1862 get_shrink = F_SHRINK
1672 get_allow_blessed = F_ALLOW_BLESSED 1863 get_allow_blessed = F_ALLOW_BLESSED
1673 get_convert_blessed = F_CONV_BLESSED 1864 get_convert_blessed = F_CONV_BLESSED
1674 get_relaxed = F_RELAXED 1865 get_relaxed = F_RELAXED
1866 get_allow_unknown = F_ALLOW_UNKNOWN
1675 PPCODE: 1867 PPCODE:
1676 XPUSHs (boolSV (self->flags & ix)); 1868 XPUSHs (boolSV (self->flags & ix));
1677 1869
1678void max_depth (JSON *self, UV max_depth = 0x80000000UL) 1870void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1679 PPCODE: 1871 PPCODE:
1680{ 1872 self->max_depth = max_depth;
1681 UV log2 = 0;
1682
1683 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1684
1685 while ((1UL << log2) < max_depth)
1686 ++log2;
1687
1688 self->flags = self->flags & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1689
1690 XPUSHs (ST (0)); 1873 XPUSHs (ST (0));
1691}
1692 1874
1693U32 get_max_depth (JSON *self) 1875U32 get_max_depth (JSON *self)
1694 CODE: 1876 CODE:
1695 RETVAL = DEC_DEPTH (self->flags); 1877 RETVAL = self->max_depth;
1696 OUTPUT: 1878 OUTPUT:
1697 RETVAL 1879 RETVAL
1698 1880
1699void max_size (JSON *self, UV max_size = 0) 1881void max_size (JSON *self, U32 max_size = 0)
1700 PPCODE: 1882 PPCODE:
1701{ 1883 self->max_size = max_size;
1702 UV log2 = 0;
1703
1704 if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1705 if (max_size == 1) max_size = 2;
1706
1707 while ((1UL << log2) < max_size)
1708 ++log2;
1709
1710 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1711
1712 XPUSHs (ST (0)); 1884 XPUSHs (ST (0));
1713}
1714 1885
1715int get_max_size (JSON *self) 1886int get_max_size (JSON *self)
1716 CODE: 1887 CODE:
1717 RETVAL = DEC_SIZE (self->flags); 1888 RETVAL = self->max_size;
1718 OUTPUT: 1889 OUTPUT:
1719 RETVAL 1890 RETVAL
1720 1891
1721void filter_json_object (JSON *self, SV *cb = &PL_sv_undef) 1892void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
1722 PPCODE: 1893 PPCODE:
1728} 1899}
1729 1900
1730void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef) 1901void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1731 PPCODE: 1902 PPCODE:
1732{ 1903{
1733 if (!self->cb_sk_object) 1904 if (!self->cb_sk_object)
1734 self->cb_sk_object = newHV (); 1905 self->cb_sk_object = newHV ();
1735 1906
1736 if (SvOK (cb)) 1907 if (SvOK (cb))
1737 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0); 1908 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1738 else 1909 else
1749 XPUSHs (ST (0)); 1920 XPUSHs (ST (0));
1750} 1921}
1751 1922
1752void encode (JSON *self, SV *scalar) 1923void encode (JSON *self, SV *scalar)
1753 PPCODE: 1924 PPCODE:
1754 XPUSHs (encode_json (scalar, self)); 1925 PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
1926 XPUSHs (scalar);
1755 1927
1756void decode (JSON *self, SV *jsonstr) 1928void decode (JSON *self, SV *jsonstr)
1757 PPCODE: 1929 PPCODE:
1758 XPUSHs (decode_json (jsonstr, self, 0)); 1930 PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
1931 XPUSHs (jsonstr);
1759 1932
1760void decode_prefix (JSON *self, SV *jsonstr) 1933void decode_prefix (JSON *self, SV *jsonstr)
1761 PPCODE: 1934 PPCODE:
1762{ 1935{
1763 STRLEN offset; 1936 SV *sv;
1937 char *offset;
1938 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1764 EXTEND (SP, 2); 1939 EXTEND (SP, 2);
1765 PUSHs (decode_json (jsonstr, self, &offset)); 1940 PUSHs (sv);
1766 PUSHs (sv_2mortal (newSVuv (offset))); 1941 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1767} 1942}
1768 1943
1769void incr_parse (JSON *self, SV *jsonstr = 0) 1944void incr_parse (JSON *self, SV *jsonstr = 0)
1770 PPCODE: 1945 PPCODE:
1771{ 1946{
1772 if (!self->incr_text) 1947 if (!self->incr_text)
1773 self->incr_text = newSVpvn ("", 0); 1948 self->incr_text = newSVpvn ("", 0);
1949
1950 /* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
1951 if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
1952 if (DECODE_WANTS_OCTETS (self))
1953 {
1954 if (self->incr_pos)
1955 self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
1956 (U8 *)SvPVX (self->incr_text) + self->incr_pos);
1957
1958 sv_utf8_downgrade (self->incr_text, 0);
1959 }
1960 else
1961 {
1962 sv_utf8_upgrade (self->incr_text);
1963
1964 if (self->incr_pos)
1965 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1966 - (U8 *)SvPVX (self->incr_text);
1967 }
1774 1968
1775 // append data, if any 1969 // append data, if any
1776 if (jsonstr) 1970 if (jsonstr)
1777 { 1971 {
1972 /* make sure both strings have same encoding */
1778 if (SvUTF8 (jsonstr) && !SvUTF8 (self->incr_text)) 1973 if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
1974 if (SvUTF8 (jsonstr))
1975 sv_utf8_downgrade (jsonstr, 0);
1779 { 1976 else
1780 /* utf-8-ness differs, need to upgrade */
1781 sv_utf8_upgrade (self->incr_text); 1977 sv_utf8_upgrade (jsonstr);
1782 1978
1783 if (self->incr_pos) 1979 /* and then just blindly append */
1784 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1785 - (U8 *)SvPVX (self->incr_text);
1786 }
1787
1788 { 1980 {
1789 STRLEN len; 1981 STRLEN len;
1790 const char *str = SvPV (jsonstr, len); 1982 const char *str = SvPV (jsonstr, len);
1791 SvGROW (self->incr_text, SvCUR (self->incr_text) + len + 1); 1983 STRLEN cur = SvCUR (self->incr_text);
1984
1985 if (SvLEN (self->incr_text) <= cur + len)
1986 SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
1987
1792 Move (str, SvEND (self->incr_text), len, char); 1988 Move (str, SvEND (self->incr_text), len, char);
1793 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len); 1989 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
1794 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there 1990 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
1795 } 1991 }
1796 } 1992 }
1797 1993
1798 if (GIMME_V != G_VOID) 1994 if (GIMME_V != G_VOID)
1799 do 1995 do
1800 { 1996 {
1997 SV *sv;
1801 STRLEN offset; 1998 char *offset;
1802
1803 incr_parse (self);
1804 1999
1805 if (!INCR_DONE (self)) 2000 if (!INCR_DONE (self))
2001 {
2002 incr_parse (self);
2003
2004 if (self->incr_pos > self->max_size && self->max_size)
2005 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
2006 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
2007
2008 if (!INCR_DONE (self))
2009 {
2010 // as an optimisation, do not accumulate white space in the incr buffer
2011 if (self->incr_mode == INCR_M_WS && self->incr_pos)
2012 {
2013 self->incr_pos = 0;
2014 SvCUR_set (self->incr_text, 0);
2015 }
2016
1806 break; 2017 break;
2018 }
2019 }
1807 2020
1808 XPUSHs (decode_json (self->incr_text, self, &offset)); 2021 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2022 XPUSHs (sv);
1809 2023
1810 sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + offset);
1811 self->incr_pos -= offset; 2024 self->incr_pos -= offset - SvPVX (self->incr_text);
1812 self->incr_nest = 0; 2025 self->incr_nest = 0;
1813 self->incr_mode = 0; 2026 self->incr_mode = 0;
2027
2028 sv_chop (self->incr_text, offset);
1814 } 2029 }
1815 while (GIMME_V == G_ARRAY); 2030 while (GIMME_V == G_ARRAY);
1816} 2031}
1817 2032
1818SV *incr_text (JSON *self) 2033SV *incr_text (JSON *self)
1819 ATTRS: lvalue 2034 ATTRS: lvalue
1820 CODE: 2035 CODE:
1821{ 2036{
1822 if (self->incr_pos) 2037 if (self->incr_pos)
1823 croak ("incr_text can only be called after a successful incr_parse call in scalar context"); 2038 croak ("incr_text can not be called when the incremental parser already started parsing");
1824 2039
1825 RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef; 2040 RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef;
1826} 2041}
1827 OUTPUT: 2042 OUTPUT:
1828 RETVAL 2043 RETVAL
1829 2044
1830void incr_skip (JSON *self) 2045void incr_skip (JSON *self)
1831 CODE: 2046 CODE:
1832{ 2047{
2048 if (self->incr_pos)
2049 {
1833 sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + self->incr_pos); 2050 sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + self->incr_pos);
2051 self->incr_pos = 0;
2052 self->incr_nest = 0;
2053 self->incr_mode = 0;
2054 }
2055}
2056
2057void incr_reset (JSON *self)
2058 CODE:
2059{
2060 SvREFCNT_dec (self->incr_text);
2061 self->incr_text = 0;
1834 self->incr_pos = 0; 2062 self->incr_pos = 0;
1835 self->incr_nest = 0; 2063 self->incr_nest = 0;
1836 self->incr_mode = 0; 2064 self->incr_mode = 0;
1837} 2065}
1838 2066
1848 ALIAS: 2076 ALIAS:
1849 to_json_ = 0 2077 to_json_ = 0
1850 encode_json = F_UTF8 2078 encode_json = F_UTF8
1851 PPCODE: 2079 PPCODE:
1852{ 2080{
1853 JSON json = { F_DEFAULT | ix }; 2081 JSON json;
1854 XPUSHs (encode_json (scalar, &json)); 2082 json_init (&json);
2083 json.flags |= ix;
2084 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2085 XPUSHs (scalar);
1855} 2086}
1856 2087
1857void decode_json (SV *jsonstr) 2088void decode_json (SV *jsonstr)
1858 ALIAS: 2089 ALIAS:
1859 from_json_ = 0 2090 from_json_ = 0
1860 decode_json = F_UTF8 2091 decode_json = F_UTF8
1861 PPCODE: 2092 PPCODE:
1862{ 2093{
1863 JSON json = { F_DEFAULT | ix }; 2094 JSON json;
1864 XPUSHs (decode_json (jsonstr, &json, 0)); 2095 json_init (&json);
2096 json.flags |= ix;
2097 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2098 XPUSHs (jsonstr);
1865} 2099}
1866 2100
1867

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines