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.106 by root, Tue Jan 19 01:36:34 2010 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
… …
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#define F_ALLOW_UNKNOWN 0x00002000UL 37#define F_ALLOW_UNKNOWN 0x00002000UL
37
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 38#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
43 39
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 40#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
48#define F_DEFAULT (9UL << S_MAXDEPTH)
49 41
50#define INIT_SIZE 32 // initial scalar size to be allocated 42#define INIT_SIZE 32 // initial scalar size to be allocated
51#define INDENT_STEP 3 // spaces per indentation level 43#define INDENT_STEP 3 // spaces per indentation level
52 44
53#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
… …
68 60
69#define IN_RANGE_INC(type,val,beg,end) \ 61#define IN_RANGE_INC(type,val,beg,end) \
70 ((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \ 62 ((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \
71 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg))) 63 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
72 64
65#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"
66
73#ifdef USE_ITHREADS 67#ifdef USE_ITHREADS
74# define JSON_SLOW 1 68# define JSON_SLOW 1
75# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1)) 69# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
76#else 70#else
77# define JSON_SLOW 0 71# define JSON_SLOW 0
… …
83 77
84enum { 78enum {
85 INCR_M_WS = 0, // initial whitespace skipping, must be 0 79 INCR_M_WS = 0, // initial whitespace skipping, must be 0
86 INCR_M_STR, // inside string 80 INCR_M_STR, // inside string
87 INCR_M_BS, // inside backslash 81 INCR_M_BS, // inside backslash
82 INCR_M_C0, // inside comment in initial whitespace sequence
83 INCR_M_C1, // inside comment in other places
88 INCR_M_JSON // outside anything, count nesting 84 INCR_M_JSON // outside anything, count nesting
89}; 85};
90 86
91#define INCR_DONE(json) (!(json)->incr_nest && (json)->incr_mode == INCR_M_JSON) 87#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
92 88
93typedef struct { 89typedef struct {
94 U32 flags; 90 U32 flags;
91 U32 max_depth;
92 STRLEN max_size;
93
95 SV *cb_object; 94 SV *cb_object;
96 HV *cb_sk_object; 95 HV *cb_sk_object;
97 96
98 // for the incremental parser 97 // for the incremental parser
99 SV *incr_text; // the source text so far 98 SV *incr_text; // the source text so far
100 STRLEN incr_pos; // the current offset into the text 99 STRLEN incr_pos; // the current offset into the text
101 int incr_nest; // {[]}-nesting level 100 int incr_nest; // {[]}-nesting level
102 int incr_mode; 101 unsigned char incr_mode;
103} JSON; 102} JSON;
103
104INLINE void
105json_init (JSON *json)
106{
107 Zero (json, 1, JSON);
108 json->max_depth = 512;
109}
104 110
105///////////////////////////////////////////////////////////////////////////// 111/////////////////////////////////////////////////////////////////////////////
106// utility functions 112// utility functions
107 113
108INLINE SV * 114INLINE SV *
… …
118 124
119INLINE void 125INLINE void
120shrink (SV *sv) 126shrink (SV *sv)
121{ 127{
122 sv_utf8_downgrade (sv, 1); 128 sv_utf8_downgrade (sv, 1);
129
123 if (SvLEN (sv) > SvCUR (sv) + 1) 130 if (SvLEN (sv) > SvCUR (sv) + 1)
124 { 131 {
125#ifdef SvPV_shrink_to_cur 132#ifdef SvPV_shrink_to_cur
126 SvPV_shrink_to_cur (sv); 133 SvPV_shrink_to_cur (sv);
127#elif defined (SvPV_renew) 134#elif defined (SvPV_renew)
… …
171 *s++ = 0x80 | ( ch & 0x3f); 178 *s++ = 0x80 | ( ch & 0x3f);
172 179
173 return s; 180 return s;
174} 181}
175 182
183// convert offset pointer to character index, sv must be string
184static STRLEN
185ptr_to_index (SV *sv, char *offset)
186{
187 return SvUTF8 (sv)
188 ? utf8_distance (offset, SvPVX (sv))
189 : offset - SvPVX (sv);
190}
191
192/////////////////////////////////////////////////////////////////////////////
193// fp hell
194
195// scan a group of digits, and a trailing exponent
196static void
197json_atof_scan1 (const char *s, NV *accum, int *expo, int postdp, int maxdepth)
198{
199 UV uaccum = 0;
200 int eaccum = 0;
201
202 // if we recurse too deep, skip all remaining digits
203 // to avoid a stack overflow attack
204 if (expect_false (--maxdepth <= 0))
205 while (((U8)*s - '0') < 10)
206 ++s;
207
208 for (;;)
209 {
210 U8 dig = (U8)*s - '0';
211
212 if (expect_false (dig >= 10))
213 {
214 if (dig == (U8)((U8)'.' - (U8)'0'))
215 {
216 ++s;
217 json_atof_scan1 (s, accum, expo, 1, maxdepth);
218 }
219 else if ((dig | ' ') == 'e' - '0')
220 {
221 int exp2 = 0;
222 int neg = 0;
223
224 ++s;
225
226 if (*s == '-')
227 {
228 ++s;
229 neg = 1;
230 }
231 else if (*s == '+')
232 ++s;
233
234 while ((dig = (U8)*s - '0') < 10)
235 exp2 = exp2 * 10 + *s++ - '0';
236
237 *expo += neg ? -exp2 : exp2;
238 }
239
240 break;
241 }
242
243 ++s;
244
245 uaccum = uaccum * 10 + dig;
246 ++eaccum;
247
248 // if we have too many digits, then recurse for more
249 // we actually do this for rather few digits
250 if (uaccum >= (UV_MAX - 9) / 10)
251 {
252 if (postdp) *expo -= eaccum;
253 json_atof_scan1 (s, accum, expo, postdp, maxdepth);
254 if (postdp) *expo += eaccum;
255
256 break;
257 }
258 }
259
260 // this relies greatly on the quality of the pow ()
261 // implementation of the platform, but a good
262 // implementation is hard to beat.
263 if (postdp) *expo -= eaccum;
264 *accum += uaccum * Perl_pow (10., *expo);
265 *expo += eaccum;
266}
267
268static NV
269json_atof (const char *s)
270{
271 NV accum = 0.;
272 int expo = 0;
273 int neg = 0;
274
275 if (*s == '-')
276 {
277 ++s;
278 neg = 1;
279 }
280
281 // a recursion depth of ten gives us >>500 bits
282 json_atof_scan1 (s, &accum, &expo, 0, 10);
283
284 return neg ? -accum : accum;
285}
176///////////////////////////////////////////////////////////////////////////// 286/////////////////////////////////////////////////////////////////////////////
177// encoder 287// encoder
178 288
179// structure used for encoding JSON 289// structure used for encoding JSON
180typedef struct 290typedef struct
… …
182 char *cur; // SvPVX (sv) + current output position 292 char *cur; // SvPVX (sv) + current output position
183 char *end; // SvEND (sv) 293 char *end; // SvEND (sv)
184 SV *sv; // result scalar 294 SV *sv; // result scalar
185 JSON json; 295 JSON json;
186 U32 indent; // indentation level 296 U32 indent; // indentation level
187 U32 maxdepth; // max. indentation/recursion level
188 UV limit; // escape character values >= this value when encoding 297 UV limit; // escape character values >= this value when encoding
189} enc_t; 298} enc_t;
190 299
191INLINE void 300INLINE void
192need (enc_t *enc, STRLEN len) 301need (enc_t *enc, STRLEN len)
193{ 302{
194 if (expect_false (enc->cur + len >= enc->end)) 303 if (expect_false (enc->cur + len >= enc->end))
195 { 304 {
196 STRLEN cur = enc->cur - SvPVX (enc->sv); 305 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
197 SvGROW (enc->sv, cur + len + 1); 306 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
198 enc->cur = SvPVX (enc->sv) + cur; 307 enc->cur = SvPVX (enc->sv) + cur;
199 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 308 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
200 } 309 }
201} 310}
202 311
… …
277 (int)((uch - 0x10000) % 0x400 + 0xDC00)); 386 (int)((uch - 0x10000) % 0x400 + 0xDC00));
278 enc->cur += 12; 387 enc->cur += 12;
279 } 388 }
280 else 389 else
281 { 390 {
282 static char hexdigit [16] = "0123456789abcdef";
283 need (enc, len += 5); 391 need (enc, len += 5);
284 *enc->cur++ = '\\'; 392 *enc->cur++ = '\\';
285 *enc->cur++ = 'u'; 393 *enc->cur++ = 'u';
286 *enc->cur++ = hexdigit [ uch >> 12 ]; 394 *enc->cur++ = PL_hexdigit [ uch >> 12 ];
287 *enc->cur++ = hexdigit [(uch >> 8) & 15]; 395 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
288 *enc->cur++ = hexdigit [(uch >> 4) & 15]; 396 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
289 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 397 *enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
290 } 398 }
291 399
292 str += clen; 400 str += clen;
293 } 401 }
294 else if (enc->json.flags & F_LATIN1) 402 else if (enc->json.flags & F_LATIN1)
… …
365static void 473static void
366encode_av (enc_t *enc, AV *av) 474encode_av (enc_t *enc, AV *av)
367{ 475{
368 int i, len = av_len (av); 476 int i, len = av_len (av);
369 477
370 if (enc->indent >= enc->maxdepth) 478 if (enc->indent >= enc->json.max_depth)
371 croak ("data structure too deep (hit recursion limit)"); 479 croak (ERR_NESTING_EXCEEDED);
372 480
373 encode_ch (enc, '['); 481 encode_ch (enc, '[');
374 482
375 if (len >= 0) 483 if (len >= 0)
376 { 484 {
… …
451static void 559static void
452encode_hv (enc_t *enc, HV *hv) 560encode_hv (enc_t *enc, HV *hv)
453{ 561{
454 HE *he; 562 HE *he;
455 563
456 if (enc->indent >= enc->maxdepth) 564 if (enc->indent >= enc->json.max_depth)
457 croak ("data structure too deep (hit recursion limit)"); 565 croak (ERR_NESTING_EXCEEDED);
458 566
459 encode_ch (enc, '{'); 567 encode_ch (enc, '{');
460 568
461 // for canonical output we have to sort by keys first 569 // for canonical output we have to sort by keys first
462 // actually, this is mostly due to the stupid so-called 570 // actually, this is mostly due to the stupid so-called
463 // security workaround added somewhere in 5.8.x. 571 // security workaround added somewhere in 5.8.x
464 // that randomises hash orderings 572 // that randomises hash orderings
465 if (enc->json.flags & F_CANONICAL) 573 if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
466 { 574 {
467 int count = hv_iterinit (hv); 575 int count = hv_iterinit (hv);
468 576
469 if (SvMAGICAL (hv)) 577 if (SvMAGICAL (hv))
470 { 578 {
… …
742 enc.json = *json; 850 enc.json = *json;
743 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 851 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
744 enc.cur = SvPVX (enc.sv); 852 enc.cur = SvPVX (enc.sv);
745 enc.end = SvEND (enc.sv); 853 enc.end = SvEND (enc.sv);
746 enc.indent = 0; 854 enc.indent = 0;
747 enc.maxdepth = DEC_DEPTH (enc.json.flags);
748 enc.limit = enc.json.flags & F_ASCII ? 0x000080UL 855 enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
749 : enc.json.flags & F_LATIN1 ? 0x000100UL 856 : enc.json.flags & F_LATIN1 ? 0x000100UL
750 : 0x110000UL; 857 : 0x110000UL;
751 858
752 SvPOK_only (enc.sv); 859 SvPOK_only (enc.sv);
753 encode_sv (&enc, scalar); 860 encode_sv (&enc, scalar);
861 encode_nl (&enc);
754 862
755 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 863 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
756 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 864 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
757 865
758 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8))) 866 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
… …
819 if (*dec->cur != ch) \ 927 if (*dec->cur != ch) \
820 ERR (# ch " expected"); \ 928 ERR (# ch " expected"); \
821 ++dec->cur; \ 929 ++dec->cur; \
822 SE 930 SE
823 931
824#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)") 932#define DEC_INC_DEPTH if (++dec->depth > dec->json.max_depth) ERR (ERR_NESTING_EXCEEDED)
825#define DEC_DEC_DEPTH --dec->depth 933#define DEC_DEC_DEPTH --dec->depth
826 934
827static SV *decode_sv (dec_t *dec); 935static SV *decode_sv (dec_t *dec);
828 936
829static signed char decode_hexdigit[256]; 937static signed char decode_hexdigit[256];
… …
938 else if (expect_true (ch >= 0x20 && ch < 0x80)) 1046 else if (expect_true (ch >= 0x20 && ch < 0x80))
939 *cur++ = ch; 1047 *cur++ = ch;
940 else if (ch >= 0x80) 1048 else if (ch >= 0x80)
941 { 1049 {
942 STRLEN clen; 1050 STRLEN clen;
943 UV uch;
944 1051
945 --dec_cur; 1052 --dec_cur;
946 1053
947 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen); 1054 decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
948 if (clen == (STRLEN)-1) 1055 if (clen == (STRLEN)-1)
949 ERR ("malformed UTF-8 character in JSON string"); 1056 ERR ("malformed UTF-8 character in JSON string");
950 1057
951 do 1058 do
952 *cur++ = *dec_cur++; 1059 *cur++ = *dec_cur++;
… …
969 { 1076 {
970 STRLEN len = cur - buf; 1077 STRLEN len = cur - buf;
971 1078
972 if (sv) 1079 if (sv)
973 { 1080 {
974 SvGROW (sv, SvCUR (sv) + len + 1); 1081 STRLEN cur = SvCUR (sv);
1082
1083 if (SvLEN (sv) <= cur + len)
1084 SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
1085
975 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 1086 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
976 SvCUR_set (sv, SvCUR (sv) + len); 1087 SvCUR_set (sv, SvCUR (sv) + len);
977 } 1088 }
978 else 1089 else
979 sv = newSVpvn (buf, len); 1090 sv = newSVpvn (buf, len);
… …
1070 1181
1071 // special case the rather common 1..5-digit-int case 1182 // special case the rather common 1..5-digit-int case
1072 if (*start == '-') 1183 if (*start == '-')
1073 switch (len) 1184 switch (len)
1074 { 1185 {
1075 case 2: return newSViv (-( start [1] - '0' * 1)); 1186 case 2: return newSViv (-(IV)( start [1] - '0' * 1));
1076 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11)); 1187 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)); 1188 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)); 1189 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)); 1190 case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
1080 } 1191 }
1081 else 1192 else
1082 switch (len) 1193 switch (len)
1083 { 1194 {
1084 case 1: return newSViv ( start [0] - '0' * 1); 1195 case 1: return newSViv ( start [0] - '0' * 1);
1085 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11); 1196 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); 1197 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); 1198 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); 1199 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
1089 } 1200 }
1090 1201
1091 { 1202 {
1092 UV uv; 1203 UV uv;
1093 int numtype = grok_number (start, len, &uv); 1204 int numtype = grok_number (start, len, &uv);
… …
1102 } 1213 }
1103 1214
1104 len -= *start == '-' ? 1 : 0; 1215 len -= *start == '-' ? 1 : 0;
1105 1216
1106 // does not fit into IV or UV, try NV 1217 // does not fit into IV or UV, try NV
1107 if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len) 1218 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 1219 // fits into NV without loss of precision
1113 return newSVnv (Atof (start)); 1220 return newSVnv (json_atof (start));
1114 1221
1115 // everything else fails, convert it to a string 1222 // everything else fails, convert it to a string
1116 return newSVpvn (start, dec->cur - start); 1223 return newSVpvn (start, dec->cur - start);
1117 } 1224 }
1118 1225
1119 // loss of precision here 1226 // loss of precision here
1120 return newSVnv (Atof (start)); 1227 return newSVnv (json_atof (start));
1121 1228
1122fail: 1229fail:
1123 return 0; 1230 return 0;
1124} 1231}
1125 1232
… …
1403fail: 1510fail:
1404 return 0; 1511 return 0;
1405} 1512}
1406 1513
1407static SV * 1514static SV *
1408decode_json (SV *string, JSON *json, STRLEN *offset_return) 1515decode_json (SV *string, JSON *json, char **offset_return)
1409{ 1516{
1410 dec_t dec; 1517 dec_t dec;
1411 STRLEN offset;
1412 SV *sv; 1518 SV *sv;
1413 1519
1520 /* work around bugs in 5.10 where manipulating magic values
1521 * will perl ignore the magic in subsequent accesses
1522 */
1414 SvGETMAGIC (string); 1523 /*SvGETMAGIC (string);*/
1524 if (SvMAGICAL (string))
1525 string = sv_2mortal (newSVsv (string));
1526
1415 SvUPGRADE (string, SVt_PV); 1527 SvUPGRADE (string, SVt_PV);
1416 1528
1417 if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags)) 1529 /* work around a bug in perl 5.10, which causes SvCUR to fail an
1530 * assertion with -DDEBUGGING, although SvCUR is documented to
1531 * return the xpv_cur field which certainly exists after upgrading.
1532 * according to nicholas clark, calling SvPOK fixes this.
1533 * But it doesn't fix it, so try another workaround, call SvPV_nolen
1534 * and hope for the best.
1535 * Damnit, SvPV_nolen still trips over yet another assertion. This
1536 * assertion business is seriously broken, try yet another workaround
1537 * for the broken -DDEBUGGING.
1538 */
1539 {
1540#ifdef DEBUGGING
1541 STRLEN offset = SvOK (string) ? sv_len (string) : 0;
1542#else
1543 STRLEN offset = SvCUR (string);
1544#endif
1545
1546 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", 1547 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)); 1548 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1549 }
1420 1550
1421 if (json->flags & F_UTF8) 1551 if (json->flags & F_UTF8)
1422 sv_utf8_downgrade (string, 0); 1552 sv_utf8_downgrade (string, 0);
1423 else 1553 else
1424 sv_utf8_upgrade (string); 1554 sv_utf8_upgrade (string);
1425 1555
1426 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1556 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1427 1557
1428 dec.json = *json; 1558 dec.json = *json;
1429 dec.cur = SvPVX (string); 1559 dec.cur = SvPVX (string);
1430 dec.end = SvEND (string); 1560 dec.end = SvEND (string);
1431 dec.err = 0; 1561 dec.err = 0;
1432 dec.depth = 0; 1562 dec.depth = 0;
1433 dec.maxdepth = DEC_DEPTH (dec.json.flags);
1434 1563
1435 if (dec.json.cb_object || dec.json.cb_sk_object) 1564 if (dec.json.cb_object || dec.json.cb_sk_object)
1436 dec.json.flags |= F_HOOK; 1565 dec.json.flags |= F_HOOK;
1437 1566
1438 *dec.end = 0; // this should basically be a nop, too, but make sure it's there 1567 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1439 1568
1440 decode_ws (&dec); 1569 decode_ws (&dec);
1441 sv = decode_sv (&dec); 1570 sv = decode_sv (&dec);
1571
1572 if (offset_return)
1573 *offset_return = dec.cur;
1442 1574
1443 if (!(offset_return || !sv)) 1575 if (!(offset_return || !sv))
1444 { 1576 {
1445 // check for trailing garbage 1577 // check for trailing garbage
1446 decode_ws (&dec); 1578 decode_ws (&dec);
… …
1449 { 1581 {
1450 dec.err = "garbage after JSON object"; 1582 dec.err = "garbage after JSON object";
1451 SvREFCNT_dec (sv); 1583 SvREFCNT_dec (sv);
1452 sv = 0; 1584 sv = 0;
1453 } 1585 }
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 } 1586 }
1465 1587
1466 if (!sv) 1588 if (!sv)
1467 { 1589 {
1468 SV *uni = sv_newmortal (); 1590 SV *uni = sv_newmortal ();
… …
1474 SAVEVPTR (PL_curcop); 1596 SAVEVPTR (PL_curcop);
1475 PL_curcop = &cop; 1597 PL_curcop = &cop;
1476 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1598 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1477 LEAVE; 1599 LEAVE;
1478 1600
1479 croak ("%s, at character offset %d [\"%s\"]", 1601 croak ("%s, at character offset %d (before \"%s\")",
1480 dec.err, 1602 dec.err,
1481 (int)offset, 1603 ptr_to_index (string, dec.cur),
1482 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1604 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1483 } 1605 }
1484 1606
1485 sv = sv_2mortal (sv); 1607 sv = sv_2mortal (sv);
1486 1608
… …
1495 1617
1496static void 1618static void
1497incr_parse (JSON *self) 1619incr_parse (JSON *self)
1498{ 1620{
1499 const char *p = SvPVX (self->incr_text) + self->incr_pos; 1621 const char *p = SvPVX (self->incr_text) + self->incr_pos;
1622
1623 // the state machine here is a bit convoluted and could be simplified a lot
1624 // but this would make it slower, so...
1500 1625
1501 for (;;) 1626 for (;;)
1502 { 1627 {
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 1628 //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) 1629 switch (self->incr_mode)
1505 { 1630 {
1506 // only used for intiial whitespace skipping 1631 // only used for initial whitespace skipping
1507 case INCR_M_WS: 1632 case INCR_M_WS:
1508 for (;;) 1633 for (;;)
1509 { 1634 {
1510 if (*p > 0x20) 1635 if (*p > 0x20)
1511 { 1636 {
1637 if (*p == '#')
1638 {
1639 self->incr_mode = INCR_M_C0;
1640 goto incr_m_c;
1641 }
1642 else
1643 {
1512 self->incr_mode = INCR_M_JSON; 1644 self->incr_mode = INCR_M_JSON;
1513 goto incr_m_json; 1645 goto incr_m_json;
1646 }
1514 } 1647 }
1515 else if (!*p) 1648 else if (!*p)
1516 goto interrupt; 1649 goto interrupt;
1517 1650
1518 ++p; 1651 ++p;
… …
1524 goto interrupt; 1657 goto interrupt;
1525 1658
1526 ++p; 1659 ++p;
1527 self->incr_mode = INCR_M_STR; 1660 self->incr_mode = INCR_M_STR;
1528 goto incr_m_str; 1661 goto incr_m_str;
1662
1663 // inside #-style comments
1664 case INCR_M_C0:
1665 case INCR_M_C1:
1666 incr_m_c:
1667 for (;;)
1668 {
1669 if (*p == '\n')
1670 {
1671 self->incr_mode = self->incr_mode == INCR_M_C0 ? INCR_M_WS : INCR_M_JSON;
1672 break;
1673 }
1674 else if (!*p)
1675 goto interrupt;
1676
1677 ++p;
1678 }
1679
1680 break;
1529 1681
1530 // inside a string 1682 // inside a string
1531 case INCR_M_STR: 1683 case INCR_M_STR:
1532 incr_m_str: 1684 incr_m_str:
1533 for (;;) 1685 for (;;)
… …
1584 self->incr_mode = INCR_M_STR; 1736 self->incr_mode = INCR_M_STR;
1585 goto incr_m_str; 1737 goto incr_m_str;
1586 1738
1587 case '[': 1739 case '[':
1588 case '{': 1740 case '{':
1589 ++self->incr_nest; 1741 if (++self->incr_nest > self->max_depth)
1742 croak (ERR_NESTING_EXCEEDED);
1590 break; 1743 break;
1591 1744
1592 case ']': 1745 case ']':
1593 case '}': 1746 case '}':
1594 if (!--self->incr_nest) 1747 if (--self->incr_nest <= 0)
1595 goto interrupt; 1748 goto interrupt;
1749 break;
1750
1751 case '#':
1752 self->incr_mode = INCR_M_C1;
1753 goto incr_m_c;
1596 } 1754 }
1597 } 1755 }
1598 } 1756 }
1599 1757
1600 modechange: 1758 modechange:
1601 ; 1759 ;
1602 } 1760 }
1603 1761
1604interrupt: 1762interrupt:
1605 self->incr_pos = p - SvPVX (self->incr_text); 1763 self->incr_pos = p - SvPVX (self->incr_text);
1764 //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 1765 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1607} 1766}
1608 1767
1609///////////////////////////////////////////////////////////////////////////// 1768/////////////////////////////////////////////////////////////////////////////
1610// XS interface functions 1769// XS interface functions
… …
1625 json_stash = gv_stashpv ("JSON::XS" , 1); 1784 json_stash = gv_stashpv ("JSON::XS" , 1);
1626 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1785 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1627 1786
1628 json_true = get_bool ("JSON::XS::true"); 1787 json_true = get_bool ("JSON::XS::true");
1629 json_false = get_bool ("JSON::XS::false"); 1788 json_false = get_bool ("JSON::XS::false");
1789
1790 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1630} 1791}
1631 1792
1632PROTOTYPES: DISABLE 1793PROTOTYPES: DISABLE
1633 1794
1634void CLONE (...) 1795void CLONE (...)
… …
1639void new (char *klass) 1800void new (char *klass)
1640 PPCODE: 1801 PPCODE:
1641{ 1802{
1642 SV *pv = NEWSV (0, sizeof (JSON)); 1803 SV *pv = NEWSV (0, sizeof (JSON));
1643 SvPOK_only (pv); 1804 SvPOK_only (pv);
1644 Zero (SvPVX (pv), 1, JSON); 1805 json_init ((JSON *)SvPVX (pv));
1645 ((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1646 XPUSHs (sv_2mortal (sv_bless ( 1806 XPUSHs (sv_2mortal (sv_bless (
1647 newRV_noinc (pv), 1807 newRV_noinc (pv),
1648 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 1808 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1649 ))); 1809 )));
1650} 1810}
… …
1691 get_relaxed = F_RELAXED 1851 get_relaxed = F_RELAXED
1692 get_allow_unknown = F_ALLOW_UNKNOWN 1852 get_allow_unknown = F_ALLOW_UNKNOWN
1693 PPCODE: 1853 PPCODE:
1694 XPUSHs (boolSV (self->flags & ix)); 1854 XPUSHs (boolSV (self->flags & ix));
1695 1855
1696void max_depth (JSON *self, UV max_depth = 0x80000000UL) 1856void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1697 PPCODE: 1857 PPCODE:
1698{ 1858 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)); 1859 XPUSHs (ST (0));
1709}
1710 1860
1711U32 get_max_depth (JSON *self) 1861U32 get_max_depth (JSON *self)
1712 CODE: 1862 CODE:
1713 RETVAL = DEC_DEPTH (self->flags); 1863 RETVAL = self->max_depth;
1714 OUTPUT: 1864 OUTPUT:
1715 RETVAL 1865 RETVAL
1716 1866
1717void max_size (JSON *self, UV max_size = 0) 1867void max_size (JSON *self, U32 max_size = 0)
1718 PPCODE: 1868 PPCODE:
1719{ 1869 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)); 1870 XPUSHs (ST (0));
1731}
1732 1871
1733int get_max_size (JSON *self) 1872int get_max_size (JSON *self)
1734 CODE: 1873 CODE:
1735 RETVAL = DEC_SIZE (self->flags); 1874 RETVAL = self->max_size;
1736 OUTPUT: 1875 OUTPUT:
1737 RETVAL 1876 RETVAL
1738 1877
1739void filter_json_object (JSON *self, SV *cb = &PL_sv_undef) 1878void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
1740 PPCODE: 1879 PPCODE:
… …
1776 XPUSHs (decode_json (jsonstr, self, 0)); 1915 XPUSHs (decode_json (jsonstr, self, 0));
1777 1916
1778void decode_prefix (JSON *self, SV *jsonstr) 1917void decode_prefix (JSON *self, SV *jsonstr)
1779 PPCODE: 1918 PPCODE:
1780{ 1919{
1781 STRLEN offset; 1920 char *offset;
1782 EXTEND (SP, 2); 1921 EXTEND (SP, 2);
1783 PUSHs (decode_json (jsonstr, self, &offset)); 1922 PUSHs (decode_json (jsonstr, self, &offset));
1784 PUSHs (sv_2mortal (newSVuv (offset))); 1923 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1785} 1924}
1786 1925
1787void incr_parse (JSON *self, SV *jsonstr = 0) 1926void incr_parse (JSON *self, SV *jsonstr = 0)
1788 PPCODE: 1927 PPCODE:
1789{ 1928{
… …
1791 self->incr_text = newSVpvn ("", 0); 1930 self->incr_text = newSVpvn ("", 0);
1792 1931
1793 // append data, if any 1932 // append data, if any
1794 if (jsonstr) 1933 if (jsonstr)
1795 { 1934 {
1796 if (SvUTF8 (jsonstr) && !SvUTF8 (self->incr_text)) 1935 if (SvUTF8 (jsonstr))
1797 { 1936 {
1937 if (!SvUTF8 (self->incr_text))
1938 {
1798 /* utf-8-ness differs, need to upgrade */ 1939 /* utf-8-ness differs, need to upgrade */
1799 sv_utf8_upgrade (self->incr_text); 1940 sv_utf8_upgrade (self->incr_text);
1800 1941
1801 if (self->incr_pos) 1942 if (self->incr_pos)
1802 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos) 1943 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1803 - (U8 *)SvPVX (self->incr_text); 1944 - (U8 *)SvPVX (self->incr_text);
1945 }
1804 } 1946 }
1947 else if (SvUTF8 (self->incr_text))
1948 sv_utf8_upgrade (jsonstr);
1805 1949
1806 { 1950 {
1807 STRLEN len; 1951 STRLEN len;
1808 const char *str = SvPV (jsonstr, len); 1952 const char *str = SvPV (jsonstr, len);
1809 SvGROW (self->incr_text, SvCUR (self->incr_text) + len + 1); 1953 STRLEN cur = SvCUR (self->incr_text);
1954
1955 if (SvLEN (self->incr_text) <= cur + len)
1956 SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
1957
1810 Move (str, SvEND (self->incr_text), len, char); 1958 Move (str, SvEND (self->incr_text), len, char);
1811 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len); 1959 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 1960 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
1813 } 1961 }
1814 } 1962 }
1815 1963
1816 if (GIMME_V != G_VOID) 1964 if (GIMME_V != G_VOID)
1817 do 1965 do
1818 { 1966 {
1819 STRLEN offset; 1967 char *offset;
1820 1968
1821 if (!INCR_DONE (self)) 1969 if (!INCR_DONE (self))
1822 { 1970 {
1823 incr_parse (self); 1971 incr_parse (self);
1972
1973 if (self->incr_pos > self->max_size && self->max_size)
1974 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1975 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
1976
1824 if (!INCR_DONE (self)) 1977 if (!INCR_DONE (self))
1825 break; 1978 break;
1826 } 1979 }
1827 1980
1828 XPUSHs (decode_json (self->incr_text, self, &offset)); 1981 XPUSHs (decode_json (self->incr_text, self, &offset));
1829 1982
1830 sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + offset);
1831 self->incr_pos -= offset; 1983 self->incr_pos -= offset - SvPVX (self->incr_text);
1832 self->incr_nest = 0; 1984 self->incr_nest = 0;
1833 self->incr_mode = 0; 1985 self->incr_mode = 0;
1986
1987 sv_chop (self->incr_text, offset);
1834 } 1988 }
1835 while (GIMME_V == G_ARRAY); 1989 while (GIMME_V == G_ARRAY);
1836} 1990}
1837 1991
1838SV *incr_text (JSON *self) 1992SV *incr_text (JSON *self)
… …
1857 self->incr_nest = 0; 2011 self->incr_nest = 0;
1858 self->incr_mode = 0; 2012 self->incr_mode = 0;
1859 } 2013 }
1860} 2014}
1861 2015
2016void incr_reset (JSON *self)
2017 CODE:
2018{
2019 SvREFCNT_dec (self->incr_text);
2020 self->incr_text = 0;
2021 self->incr_pos = 0;
2022 self->incr_nest = 0;
2023 self->incr_mode = 0;
2024}
2025
1862void DESTROY (JSON *self) 2026void DESTROY (JSON *self)
1863 CODE: 2027 CODE:
1864 SvREFCNT_dec (self->cb_sk_object); 2028 SvREFCNT_dec (self->cb_sk_object);
1865 SvREFCNT_dec (self->cb_object); 2029 SvREFCNT_dec (self->cb_object);
1866 SvREFCNT_dec (self->incr_text); 2030 SvREFCNT_dec (self->incr_text);
… …
1871 ALIAS: 2035 ALIAS:
1872 to_json_ = 0 2036 to_json_ = 0
1873 encode_json = F_UTF8 2037 encode_json = F_UTF8
1874 PPCODE: 2038 PPCODE:
1875{ 2039{
1876 JSON json = { F_DEFAULT | ix }; 2040 JSON json;
2041 json_init (&json);
2042 json.flags |= ix;
1877 XPUSHs (encode_json (scalar, &json)); 2043 XPUSHs (encode_json (scalar, &json));
1878} 2044}
1879 2045
1880void decode_json (SV *jsonstr) 2046void decode_json (SV *jsonstr)
1881 ALIAS: 2047 ALIAS:
1882 from_json_ = 0 2048 from_json_ = 0
1883 decode_json = F_UTF8 2049 decode_json = F_UTF8
1884 PPCODE: 2050 PPCODE:
1885{ 2051{
1886 JSON json = { F_DEFAULT | ix }; 2052 JSON json;
2053 json_init (&json);
2054 json.flags |= ix;
1887 XPUSHs (decode_json (jsonstr, &json, 0)); 2055 XPUSHs (decode_json (jsonstr, &json, 0));
1888} 2056}
1889 2057
1890

Diff Legend

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