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.78 by root, Tue Mar 25 19:31:02 2008 UTC vs.
Revision 1.133 by root, Tue Aug 28 16:16:17 2018 UTC

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

Diff Legend

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