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.123 by root, Sun Dec 8 20:44:23 2013 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
… …
77 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg))) 78 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
78 79
79#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)" 80#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"
80 81
81#ifdef USE_ITHREADS 82#ifdef USE_ITHREADS
82# define JSON_SLOW 1
83# 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))
84#else 86#else
85# define JSON_SLOW 0
86# define JSON_STASH json_stash 87# define JSON_STASH json_stash
88# define BOOL_STASH bool_stash
89# define GET_BOOL(value) bool_ ## value
87#endif 90#endif
88 91
89// the amount of HEs to allocate on the stack, when sorting keys 92// the amount of HEs to allocate on the stack, when sorting keys
90#define STACK_HES 64 93#define STACK_HES 64
91 94
92static HV *json_stash, *types_boolean_stash; // JSON::XS:: 95static HV *json_stash, *bool_stash; // JSON::XS::, Types::Serialiser::Boolean::
93static SV *types_true, *types_false, *sv_json; 96static SV *bool_false, *bool_true;
97static SV *sv_json;
94 98
95enum { 99enum {
96 INCR_M_WS = 0, // initial whitespace skipping, must be 0 100 INCR_M_WS = 0, // initial whitespace skipping, must be 0
97 INCR_M_STR, // inside string 101 INCR_M_STR, // inside string
98 INCR_M_BS, // inside backslash 102 INCR_M_BS, // inside backslash
… …
114 // for the incremental parser 118 // for the incremental parser
115 SV *incr_text; // the source text so far 119 SV *incr_text; // the source text so far
116 STRLEN incr_pos; // the current offset into the text 120 STRLEN incr_pos; // the current offset into the text
117 int incr_nest; // {[]}-nesting level 121 int incr_nest; // {[]}-nesting level
118 unsigned char incr_mode; 122 unsigned char incr_mode;
123
124 SV *v_false, *v_true;
119} JSON; 125} JSON;
120 126
121INLINE void 127INLINE void
122json_init (JSON *json) 128json_init (JSON *json)
123{ 129{
… …
152 SvPV_renew (sv, SvCUR (sv) + 1); 158 SvPV_renew (sv, SvCUR (sv) + 1);
153#endif 159#endif
154 } 160 }
155} 161}
156 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
157// 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
158// case of an error. 189// case of an error.
159// we special-case "safe" characters from U+80 .. U+7FF, 190// we special-case "safe" characters from U+80 .. U+7FF,
160// but use the very good perl function to parse anything else. 191// but use the very good perl function to parse anything else.
161// note that we never call this function for a ascii codepoints 192// note that we never call this function for a ascii codepoints
162INLINE UV 193INLINE UV
… …
299 // a recursion depth of ten gives us >>500 bits 330 // a recursion depth of ten gives us >>500 bits
300 json_atof_scan1 (s, &accum, &expo, 0, 10); 331 json_atof_scan1 (s, &accum, &expo, 0, 10);
301 332
302 return neg ? -accum : accum; 333 return neg ? -accum : accum;
303} 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
304///////////////////////////////////////////////////////////////////////////// 378/////////////////////////////////////////////////////////////////////////////
305// encoder 379// encoder
306 380
307// structure used for encoding JSON 381// structure used for encoding JSON
308typedef struct 382typedef struct
… …
316} enc_t; 390} enc_t;
317 391
318INLINE void 392INLINE void
319need (enc_t *enc, STRLEN len) 393need (enc_t *enc, STRLEN len)
320{ 394{
321 if (expect_false (enc->cur + len >= enc->end)) 395 if (expect_false ((uintptr_t)(enc->end - enc->cur) < len))
322 { 396 {
323 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 397 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
324 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 398 char *buf = json_sv_grow (enc->sv, cur, len);
325 enc->cur = SvPVX (enc->sv) + cur; 399 enc->cur = buf + cur;
326 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 400 enc->end = buf + SvLEN (enc->sv) - 1;
327 } 401 }
328} 402}
329 403
330INLINE void 404INLINE void
331encode_ch (enc_t *enc, char ch) 405encode_ch (enc_t *enc, char ch)
… …
347 421
348 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case 422 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case
349 { 423 {
350 if (expect_false (ch == '"')) // but with slow exceptions 424 if (expect_false (ch == '"')) // but with slow exceptions
351 { 425 {
352 need (enc, len += 1); 426 need (enc, len + 1);
353 *enc->cur++ = '\\'; 427 *enc->cur++ = '\\';
354 *enc->cur++ = '"'; 428 *enc->cur++ = '"';
355 } 429 }
356 else if (expect_false (ch == '\\')) 430 else if (expect_false (ch == '\\'))
357 { 431 {
358 need (enc, len += 1); 432 need (enc, len + 1);
359 *enc->cur++ = '\\'; 433 *enc->cur++ = '\\';
360 *enc->cur++ = '\\'; 434 *enc->cur++ = '\\';
361 } 435 }
362 else 436 else
363 *enc->cur++ = ch; 437 *enc->cur++ = ch;
… …
366 } 440 }
367 else 441 else
368 { 442 {
369 switch (ch) 443 switch (ch)
370 { 444 {
371 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;
372 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;
373 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;
374 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;
375 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;
376 450
377 default: 451 default:
378 { 452 {
379 STRLEN clen; 453 STRLEN clen;
380 UV uch; 454 UV uch;
… …
396 if (uch >= 0x10000UL) 470 if (uch >= 0x10000UL)
397 { 471 {
398 if (uch >= 0x110000UL) 472 if (uch >= 0x110000UL)
399 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);
400 474
401 need (enc, len += 11); 475 need (enc, len + 11);
402 sprintf (enc->cur, "\\u%04x\\u%04x", 476 sprintf (enc->cur, "\\u%04x\\u%04x",
403 (int)((uch - 0x10000) / 0x400 + 0xD800), 477 (int)((uch - 0x10000) / 0x400 + 0xD800),
404 (int)((uch - 0x10000) % 0x400 + 0xDC00)); 478 (int)((uch - 0x10000) % 0x400 + 0xDC00));
405 enc->cur += 12; 479 enc->cur += 12;
406 } 480 }
407 else 481 else
408 { 482 {
409 need (enc, len += 5); 483 need (enc, len + 5);
410 *enc->cur++ = '\\'; 484 *enc->cur++ = '\\';
411 *enc->cur++ = 'u'; 485 *enc->cur++ = 'u';
412 *enc->cur++ = PL_hexdigit [ uch >> 12 ]; 486 *enc->cur++ = PL_hexdigit [ uch >> 12 ];
413 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15]; 487 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
414 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15]; 488 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
… …
422 *enc->cur++ = uch; 496 *enc->cur++ = uch;
423 str += clen; 497 str += clen;
424 } 498 }
425 else if (is_utf8) 499 else if (is_utf8)
426 { 500 {
427 need (enc, len += clen); 501 need (enc, len + clen);
428 do 502 do
429 { 503 {
430 *enc->cur++ = *str++; 504 *enc->cur++ = *str++;
431 } 505 }
432 while (--clen); 506 while (--clen);
433 } 507 }
434 else 508 else
435 { 509 {
436 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
437 enc->cur = encode_utf8 (enc->cur, uch); 511 enc->cur = encode_utf8 (enc->cur, uch);
438 ++str; 512 ++str;
439 } 513 }
440 } 514 }
441 } 515 }
… …
701 SvGETMAGIC (sv); 775 SvGETMAGIC (sv);
702 svt = SvTYPE (sv); 776 svt = SvTYPE (sv);
703 777
704 if (expect_false (SvOBJECT (sv))) 778 if (expect_false (SvOBJECT (sv)))
705 { 779 {
706 HV *boolean_stash = !JSON_SLOW || types_boolean_stash
707 ? types_boolean_stash
708 : gv_stashpv ("Types::Serialiser::Boolean", 1);
709 HV *stash = SvSTASH (sv); 780 HV *stash = SvSTASH (sv);
710 781
711 if (stash == boolean_stash) 782 if (stash == bool_stash)
712 { 783 {
713 if (SvIV (sv))
714 encode_str (enc, "true", 4, 0); 784 if (SvIV (sv)) encode_str (enc, "true" , 4, 0);
715 else
716 encode_str (enc, "false", 5, 0); 785 else encode_str (enc, "false", 5, 0);
717 } 786 }
718 else if ((enc->json.flags & F_ALLOW_TAGS) && (method = gv_fetchmethod_autoload (stash, "FREEZE", 0))) 787 else if ((enc->json.flags & F_ALLOW_TAGS) && (method = gv_fetchmethod_autoload (stash, "FREEZE", 0)))
719 { 788 {
720 int count; 789 int count;
721 dSP; 790 dSP;
722 791
723 ENTER; SAVETMPS; PUSHMARK (SP); 792 ENTER; SAVETMPS;
793 SAVESTACK_POS ();
794 PUSHMARK (SP);
724 EXTEND (SP, 2); 795 EXTEND (SP, 2);
725 // we re-bless the reference to get overload and other niceties right 796 // we re-bless the reference to get overload and other niceties right
726 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 797 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
727 PUSHs (sv_json); 798 PUSHs (sv_json);
728 799
… …
749 encode_ch (enc, ','); 820 encode_ch (enc, ',');
750 } 821 }
751 822
752 encode_ch (enc, ']'); 823 encode_ch (enc, ']');
753 824
754 PUTBACK;
755
756 FREETMPS; LEAVE; 825 FREETMPS; LEAVE;
757 } 826 }
758 else if ((enc->json.flags & F_CONV_BLESSED) && (method = gv_fetchmethod_autoload (stash, "TO_JSON", 0))) 827 else if ((enc->json.flags & F_CONV_BLESSED) && (method = gv_fetchmethod_autoload (stash, "TO_JSON", 0)))
759 { 828 {
760 dSP; 829 dSP;
761 830
762 ENTER; SAVETMPS; PUSHMARK (SP); 831 ENTER; SAVETMPS;
832 PUSHMARK (SP);
763 // we re-bless the reference to get overload and other niceties right 833 // we re-bless the reference to get overload and other niceties right
764 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 834 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
765 835
766 // calling with G_SCALAR ensures that we always get a 1 return value 836 // calling with G_SCALAR ensures that we always get a 1 return value
767 PUTBACK; 837 PUTBACK;
… …
789 encode_hv (enc, (HV *)sv); 859 encode_hv (enc, (HV *)sv);
790 else if (svt == SVt_PVAV) 860 else if (svt == SVt_PVAV)
791 encode_av (enc, (AV *)sv); 861 encode_av (enc, (AV *)sv);
792 else if (svt < SVt_PVAV) 862 else if (svt < SVt_PVAV)
793 { 863 {
794 STRLEN len = 0; 864 int bool_type = ref_bool_type (sv);
795 char *pv = svt ? SvPV (sv, len) : 0;
796 865
797 if (len == 1 && *pv == '1') 866 if (bool_type == 1)
798 encode_str (enc, "true", 4, 0); 867 encode_str (enc, "true", 4, 0);
799 else if (len == 1 && *pv == '0') 868 else if (bool_type == 0)
800 encode_str (enc, "false", 5, 0); 869 encode_str (enc, "false", 5, 0);
801 else if (enc->json.flags & F_ALLOW_UNKNOWN) 870 else if (enc->json.flags & F_ALLOW_UNKNOWN)
802 encode_str (enc, "null", 4, 0); 871 encode_str (enc, "null", 4, 0);
803 else 872 else
804 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",
… …
887static SV * 956static SV *
888encode_json (SV *scalar, JSON *json) 957encode_json (SV *scalar, JSON *json)
889{ 958{
890 enc_t enc; 959 enc_t enc;
891 960
892 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar)) 961 if (!(json->flags & F_ALLOW_NONREF) && json_nonref (scalar))
893 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)");
894 963
895 enc.json = *json; 964 enc.json = *json;
896 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 965 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
897 enc.cur = SvPVX (enc.sv); 966 enc.cur = SvPVX (enc.sv);
… …
1104 *cur++ = *dec_cur++; 1173 *cur++ = *dec_cur++;
1105 while (--clen); 1174 while (--clen);
1106 1175
1107 utf8 = 1; 1176 utf8 = 1;
1108 } 1177 }
1178 else if (ch == '\t' && dec->json.flags & F_RELAXED)
1179 *cur++ = ch;
1109 else 1180 else
1110 { 1181 {
1111 --dec_cur; 1182 --dec_cur;
1112 1183
1113 if (!ch) 1184 if (!ch)
… …
1123 1194
1124 if (sv) 1195 if (sv)
1125 { 1196 {
1126 STRLEN cur = SvCUR (sv); 1197 STRLEN cur = SvCUR (sv);
1127 1198
1128 if (SvLEN (sv) <= cur + len) 1199 if (SvLEN (sv) - cur <= len)
1129 SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 1200 json_sv_grow (sv, cur, len);
1130 1201
1131 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 1202 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
1132 SvCUR_set (sv, SvCUR (sv) + len); 1203 SvCUR_set (sv, SvCUR (sv) + len);
1133 } 1204 }
1134 else 1205 else
… …
1435 1506
1436 hv_iterinit (hv); 1507 hv_iterinit (hv);
1437 he = hv_iternext (hv); 1508 he = hv_iternext (hv);
1438 hv_iterinit (hv); 1509 hv_iterinit (hv);
1439 1510
1440 // the next line creates a mortal sv each time its called. 1511 // the next line creates a mortal sv each time it's called.
1441 // might want to optimise this for common cases. 1512 // might want to optimise this for common cases.
1442 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);
1443 1514
1444 if (cb) 1515 if (cb)
1445 { 1516 {
1446 dSP; 1517 dSP;
1447 int count; 1518 int count;
1448 1519
1449 ENTER; SAVETMPS; PUSHMARK (SP); 1520 ENTER; SAVETMPS;
1521 SAVESTACK_POS ();
1522 PUSHMARK (SP);
1450 XPUSHs (HeVAL (he)); 1523 XPUSHs (HeVAL (he));
1451 sv_2mortal (sv); 1524 sv_2mortal (sv);
1452 1525
1453 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1526 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1454 1527
… …
1467 if (dec->json.cb_object) 1540 if (dec->json.cb_object)
1468 { 1541 {
1469 dSP; 1542 dSP;
1470 int count; 1543 int count;
1471 1544
1472 ENTER; SAVETMPS; PUSHMARK (SP); 1545 ENTER; SAVETMPS;
1546 SAVESTACK_POS ();
1547 PUSHMARK (SP);
1473 XPUSHs (sv_2mortal (sv)); 1548 XPUSHs (sv_2mortal (sv));
1474 1549
1475 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN; 1550 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1476 1551
1477 if (count == 1) 1552 if (count == 1)
… …
1544 if (!method) 1619 if (!method)
1545 ERR ("cannot decode perl-object (package does not have a THAW method)"); 1620 ERR ("cannot decode perl-object (package does not have a THAW method)");
1546 1621
1547 dSP; 1622 dSP;
1548 1623
1549 ENTER; SAVETMPS; PUSHMARK (SP); 1624 ENTER; SAVETMPS;
1625 PUSHMARK (SP);
1550 EXTEND (SP, len + 2); 1626 EXTEND (SP, len + 2);
1551 // we re-bless the reference to get overload and other niceties right 1627 // we re-bless the reference to get overload and other niceties right
1552 PUSHs (tag); 1628 PUSHs (tag);
1553 PUSHs (sv_json); 1629 PUSHs (sv_json);
1554 1630
… …
1591 case '-': 1667 case '-':
1592 case '0': case '1': case '2': case '3': case '4': 1668 case '0': case '1': case '2': case '3': case '4':
1593 case '5': case '6': case '7': case '8': case '9': 1669 case '5': case '6': case '7': case '8': case '9':
1594 return decode_num (dec); 1670 return decode_num (dec);
1595 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
1596 case 't': 1687 case 't':
1597 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1688 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1598 { 1689 {
1599 dec->cur += 4; 1690 dec->cur += 4;
1600#if JSON_SLOW 1691
1601 types_true = get_bool ("Types::Serialiser::true"); 1692 if (expect_false (!dec->json.v_true))
1602#endif 1693 dec->json.v_true = GET_BOOL (true);
1694
1603 return newSVsv (types_true); 1695 return newSVsv (dec->json.v_true);
1604 } 1696 }
1605 else 1697 else
1606 ERR ("'true' expected"); 1698 ERR ("'true' expected");
1607
1608 break;
1609
1610 case 'f':
1611 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1612 {
1613 dec->cur += 5;
1614#if JSON_SLOW
1615 types_false = get_bool ("Types::Serialiser::false");
1616#endif
1617 return newSVsv (types_false);
1618 }
1619 else
1620 ERR ("'false' expected");
1621 1699
1622 break; 1700 break;
1623 1701
1624 case 'n': 1702 case 'n':
1625 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4)) 1703 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4))
… …
1640fail: 1718fail:
1641 return 0; 1719 return 0;
1642} 1720}
1643 1721
1644static SV * 1722static SV *
1645decode_json (SV *string, JSON *json, char **offset_return) 1723decode_json (SV *string, JSON *json, STRLEN *offset_return)
1646{ 1724{
1647 dec_t dec; 1725 dec_t dec;
1648 SV *sv; 1726 SV *sv;
1649 1727
1650 /* work around bugs in 5.10 where manipulating magic values 1728 /* work around bugs in 5.10 where manipulating magic values
1651 * makes perl ignore the magic in subsequent accesses. 1729 * makes perl ignore the magic in subsequent accesses.
1652 * also make a copy of non-PV values, to get them into a clean 1730 * also make a copy of non-PV values, to get them into a clean
1653 * state (SvPV should do that, but it's buggy, see below). 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.
1654 */ 1735 */
1655 /*SvGETMAGIC (string);*/ 1736 /*SvGETMAGIC (string);*/
1656 if (SvMAGICAL (string) || !SvPOK (string)) 1737 if (SvMAGICAL (string) || !SvPOK (string) || SvIsCOW_shared_hash (string))
1657 string = sv_2mortal (newSVsv (string)); 1738 string = sv_2mortal (newSVsv (string));
1658 1739
1659 SvUPGRADE (string, SVt_PV); 1740 SvUPGRADE (string, SVt_PV);
1660 1741
1661 /* work around a bug in perl 5.10, which causes SvCUR to fail an 1742 /* work around a bug in perl 5.10, which causes SvCUR to fail an
… …
1700 1781
1701 decode_ws (&dec); 1782 decode_ws (&dec);
1702 sv = decode_sv (&dec); 1783 sv = decode_sv (&dec);
1703 1784
1704 if (offset_return) 1785 if (offset_return)
1705 *offset_return = dec.cur; 1786 *offset_return = dec.cur - SvPVX (string);
1706 1787 else if (sv)
1707 if (!(offset_return || !sv))
1708 { 1788 {
1709 // check for trailing garbage 1789 // check for trailing garbage
1710 decode_ws (&dec); 1790 decode_ws (&dec);
1711 1791
1712 if (*dec.cur) 1792 if (*dec.cur)
… …
1736 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1816 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1737 } 1817 }
1738 1818
1739 sv = sv_2mortal (sv); 1819 sv = sv_2mortal (sv);
1740 1820
1741 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1821 if (!(dec.json.flags & F_ALLOW_NONREF) && json_nonref (sv))
1742 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)");
1743 1823
1744 return sv; 1824 return sv;
1745} 1825}
1746 1826
… …
1916 i >= '0' && i <= '9' ? i - '0' 1996 i >= '0' && i <= '9' ? i - '0'
1917 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1997 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1918 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1998 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1919 : -1; 1999 : -1;
1920 2000
1921 json_stash = gv_stashpv ("JSON::XS" , 1); 2001 json_stash = gv_stashpv ("JSON::XS" , 1);
1922 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1); 2002 bool_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1923
1924 types_true = get_bool ("Types::Serialiser::true");
1925 types_false = get_bool ("Types::Serialiser::false"); 2003 bool_false = get_bool ("Types::Serialiser::false");
2004 bool_true = get_bool ("Types::Serialiser::true");
1926 2005
1927 sv_json = newSVpv ("JSON", 0); 2006 sv_json = newSVpv ("JSON", 0);
1928 SvREADONLY_on (sv_json); 2007 SvREADONLY_on (sv_json);
1929 2008
1930 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */ 2009 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
… …
1932 2011
1933PROTOTYPES: DISABLE 2012PROTOTYPES: DISABLE
1934 2013
1935void CLONE (...) 2014void CLONE (...)
1936 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.
1937 json_stash = 0; 2019 json_stash = 0;
1938 types_boolean_stash = 0; 2020 bool_stash = 0;
2021 bool_false = 0;
2022 bool_true = 0;
1939 2023
1940void new (char *klass) 2024void new (char *klass)
1941 PPCODE: 2025 PPCODE:
1942{ 2026{
1943 SV *pv = NEWSV (0, sizeof (JSON)); 2027 SV *pv = NEWSV (0, sizeof (JSON));
… …
1946 XPUSHs (sv_2mortal (sv_bless ( 2030 XPUSHs (sv_2mortal (sv_bless (
1947 newRV_noinc (pv), 2031 newRV_noinc (pv),
1948 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 2032 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1949 ))); 2033 )));
1950} 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 }
1951 2050
1952void ascii (JSON *self, int enable = 1) 2051void ascii (JSON *self, int enable = 1)
1953 ALIAS: 2052 ALIAS:
1954 ascii = F_ASCII 2053 ascii = F_ASCII
1955 latin1 = F_LATIN1 2054 latin1 = F_LATIN1
… …
2060 2159
2061void decode_prefix (JSON *self, SV *jsonstr) 2160void decode_prefix (JSON *self, SV *jsonstr)
2062 PPCODE: 2161 PPCODE:
2063{ 2162{
2064 SV *sv; 2163 SV *sv;
2065 char *offset; 2164 STRLEN offset;
2066 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN; 2165 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
2067 EXTEND (SP, 2); 2166 EXTEND (SP, 2);
2068 PUSHs (sv); 2167 PUSHs (sv);
2069 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset)))); 2168 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, SvPV_nolen (jsonstr) + offset))));
2070} 2169}
2071 2170
2072void incr_parse (JSON *self, SV *jsonstr = 0) 2171void incr_parse (JSON *self, SV *jsonstr = 0)
2073 PPCODE: 2172 PPCODE:
2074{ 2173{
… …
2108 { 2207 {
2109 STRLEN len; 2208 STRLEN len;
2110 const char *str = SvPV (jsonstr, len); 2209 const char *str = SvPV (jsonstr, len);
2111 STRLEN cur = SvCUR (self->incr_text); 2210 STRLEN cur = SvCUR (self->incr_text);
2112 2211
2113 if (SvLEN (self->incr_text) <= cur + len) 2212 if (SvLEN (self->incr_text) - cur <= len)
2114 SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 2213 json_sv_grow (self->incr_text, cur, len);
2115 2214
2116 Move (str, SvEND (self->incr_text), len, char); 2215 Move (str, SvEND (self->incr_text), len, char);
2117 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len); 2216 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
2118 *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
2119 } 2218 }
… …
2121 2220
2122 if (GIMME_V != G_VOID) 2221 if (GIMME_V != G_VOID)
2123 do 2222 do
2124 { 2223 {
2125 SV *sv; 2224 SV *sv;
2126 char *offset; 2225 STRLEN offset;
2127 2226
2128 if (!INCR_DONE (self)) 2227 if (!INCR_DONE (self))
2129 { 2228 {
2130 incr_parse (self); 2229 incr_parse (self);
2131 2230
… …
2147 } 2246 }
2148 2247
2149 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN; 2248 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2150 XPUSHs (sv); 2249 XPUSHs (sv);
2151 2250
2152 self->incr_pos -= offset - SvPVX (self->incr_text); 2251 self->incr_pos -= offset;
2153 self->incr_nest = 0; 2252 self->incr_nest = 0;
2154 self->incr_mode = 0; 2253 self->incr_mode = 0;
2155 2254
2156 sv_chop (self->incr_text, offset); 2255 sv_chop (self->incr_text, SvPVX (self->incr_text) + offset);
2157 } 2256 }
2158 while (GIMME_V == G_ARRAY); 2257 while (GIMME_V == G_ARRAY);
2159} 2258}
2160 2259
2161SV *incr_text (JSON *self) 2260SV *incr_text (JSON *self)
… …
2192 self->incr_mode = 0; 2291 self->incr_mode = 0;
2193} 2292}
2194 2293
2195void DESTROY (JSON *self) 2294void DESTROY (JSON *self)
2196 CODE: 2295 CODE:
2296 SvREFCNT_dec (self->v_false);
2297 SvREFCNT_dec (self->v_true);
2197 SvREFCNT_dec (self->cb_sk_object); 2298 SvREFCNT_dec (self->cb_sk_object);
2198 SvREFCNT_dec (self->cb_object); 2299 SvREFCNT_dec (self->cb_object);
2199 SvREFCNT_dec (self->incr_text); 2300 SvREFCNT_dec (self->incr_text);
2200 2301
2201PROTOTYPES: ENABLE 2302PROTOTYPES: ENABLE

Diff Legend

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