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.77 by root, Tue Mar 25 06:37:38 2008 UTC vs.
Revision 1.138 by root, Wed Mar 6 07:21:17 2019 UTC

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

Diff Legend

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