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.134 by root, Thu Nov 15 20:13:03 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
… …
49#define F_ALLOW_TAGS 0x00004000UL 50#define F_ALLOW_TAGS 0x00004000UL
50#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing 51#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
51 52
52#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 53#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
53 54
54#define INIT_SIZE 32 // initial scalar size to be allocated 55#define INIT_SIZE 64 // initial scalar size to be allocated
55#define INDENT_STEP 3 // spaces per indentation level 56#define INDENT_STEP 3 // spaces per indentation level
56 57
57#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
58 59
59#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8) 60#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8)
… …
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 PUSHMARK (SP);
724 EXTEND (SP, 2); 794 EXTEND (SP, 2);
725 // we re-bless the reference to get overload and other niceties right 795 // we re-bless the reference to get overload and other niceties right
726 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 796 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
727 PUSHs (sv_json); 797 PUSHs (sv_json);
728 798
… …
739 encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash)); 809 encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
740 encode_ch (enc, '"'); 810 encode_ch (enc, '"');
741 encode_ch (enc, ')'); 811 encode_ch (enc, ')');
742 encode_ch (enc, '['); 812 encode_ch (enc, '[');
743 813
744 while (count) 814 if (count)
745 { 815 {
816 int i;
817
818 for (i = 0; i < count - 1; ++i)
819 {
746 encode_sv (enc, SP[1 - count--]); 820 encode_sv (enc, SP[i + 1 - count]);
747
748 if (count)
749 encode_ch (enc, ','); 821 encode_ch (enc, ',');
822 }
823
824 encode_sv (enc, TOPs);
825 SP -= count;
750 } 826 }
751 827
752 encode_ch (enc, ']'); 828 encode_ch (enc, ']');
753
754 PUTBACK;
755 829
756 FREETMPS; LEAVE; 830 FREETMPS; LEAVE;
757 } 831 }
758 else if ((enc->json.flags & F_CONV_BLESSED) && (method = gv_fetchmethod_autoload (stash, "TO_JSON", 0))) 832 else if ((enc->json.flags & F_CONV_BLESSED) && (method = gv_fetchmethod_autoload (stash, "TO_JSON", 0)))
759 { 833 {
760 dSP; 834 dSP;
761 835
762 ENTER; SAVETMPS; PUSHMARK (SP); 836 ENTER; SAVETMPS;
837 PUSHMARK (SP);
763 // we re-bless the reference to get overload and other niceties right 838 // we re-bless the reference to get overload and other niceties right
764 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 839 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
765 840
766 // calling with G_SCALAR ensures that we always get a 1 return value 841 // calling with G_SCALAR ensures that we always get a 1 return value
767 PUTBACK; 842 PUTBACK;
… …
789 encode_hv (enc, (HV *)sv); 864 encode_hv (enc, (HV *)sv);
790 else if (svt == SVt_PVAV) 865 else if (svt == SVt_PVAV)
791 encode_av (enc, (AV *)sv); 866 encode_av (enc, (AV *)sv);
792 else if (svt < SVt_PVAV) 867 else if (svt < SVt_PVAV)
793 { 868 {
794 STRLEN len = 0; 869 int bool_type = ref_bool_type (sv);
795 char *pv = svt ? SvPV (sv, len) : 0;
796 870
797 if (len == 1 && *pv == '1') 871 if (bool_type == 1)
798 encode_str (enc, "true", 4, 0); 872 encode_str (enc, "true", 4, 0);
799 else if (len == 1 && *pv == '0') 873 else if (bool_type == 0)
800 encode_str (enc, "false", 5, 0); 874 encode_str (enc, "false", 5, 0);
801 else if (enc->json.flags & F_ALLOW_UNKNOWN) 875 else if (enc->json.flags & F_ALLOW_UNKNOWN)
802 encode_str (enc, "null", 4, 0); 876 encode_str (enc, "null", 4, 0);
803 else 877 else
804 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 878 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
… …
887static SV * 961static SV *
888encode_json (SV *scalar, JSON *json) 962encode_json (SV *scalar, JSON *json)
889{ 963{
890 enc_t enc; 964 enc_t enc;
891 965
892 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar)) 966 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)"); 967 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
894 968
895 enc.json = *json; 969 enc.json = *json;
896 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 970 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
897 enc.cur = SvPVX (enc.sv); 971 enc.cur = SvPVX (enc.sv);
… …
1104 *cur++ = *dec_cur++; 1178 *cur++ = *dec_cur++;
1105 while (--clen); 1179 while (--clen);
1106 1180
1107 utf8 = 1; 1181 utf8 = 1;
1108 } 1182 }
1183 else if (ch == '\t' && dec->json.flags & F_RELAXED)
1184 *cur++ = ch;
1109 else 1185 else
1110 { 1186 {
1111 --dec_cur; 1187 --dec_cur;
1112 1188
1113 if (!ch) 1189 if (!ch)
… …
1123 1199
1124 if (sv) 1200 if (sv)
1125 { 1201 {
1126 STRLEN cur = SvCUR (sv); 1202 STRLEN cur = SvCUR (sv);
1127 1203
1128 if (SvLEN (sv) <= cur + len) 1204 if (SvLEN (sv) - cur <= len)
1129 SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 1205 json_sv_grow (sv, cur, len);
1130 1206
1131 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 1207 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
1132 SvCUR_set (sv, SvCUR (sv) + len); 1208 SvCUR_set (sv, SvCUR (sv) + len);
1133 } 1209 }
1134 else 1210 else
… …
1435 1511
1436 hv_iterinit (hv); 1512 hv_iterinit (hv);
1437 he = hv_iternext (hv); 1513 he = hv_iternext (hv);
1438 hv_iterinit (hv); 1514 hv_iterinit (hv);
1439 1515
1440 // the next line creates a mortal sv each time its called. 1516 // the next line creates a mortal sv each time it's called.
1441 // might want to optimise this for common cases. 1517 // might want to optimise this for common cases.
1442 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0); 1518 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
1443 1519
1444 if (cb) 1520 if (cb)
1445 { 1521 {
1446 dSP; 1522 dSP;
1447 int count; 1523 int count;
1448 1524
1449 ENTER; SAVETMPS; PUSHMARK (SP); 1525 ENTER; SAVETMPS;
1526 PUSHMARK (SP);
1450 XPUSHs (HeVAL (he)); 1527 XPUSHs (HeVAL (he));
1451 sv_2mortal (sv); 1528 sv_2mortal (sv);
1452 1529
1453 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1530 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1454 1531
… …
1456 { 1533 {
1457 sv = newSVsv (POPs); 1534 sv = newSVsv (POPs);
1458 FREETMPS; LEAVE; 1535 FREETMPS; LEAVE;
1459 return sv; 1536 return sv;
1460 } 1537 }
1538 else if (count)
1539 croak ("filter_json_single_key_object callbacks must not return more than one scalar");
1461 1540
1462 SvREFCNT_inc (sv); 1541 SvREFCNT_inc (sv);
1463 FREETMPS; LEAVE; 1542 FREETMPS; LEAVE;
1464 } 1543 }
1465 } 1544 }
… …
1467 if (dec->json.cb_object) 1546 if (dec->json.cb_object)
1468 { 1547 {
1469 dSP; 1548 dSP;
1470 int count; 1549 int count;
1471 1550
1472 ENTER; SAVETMPS; PUSHMARK (SP); 1551 ENTER; SAVETMPS;
1552 PUSHMARK (SP);
1473 XPUSHs (sv_2mortal (sv)); 1553 XPUSHs (sv_2mortal (sv));
1474 1554
1475 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN; 1555 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1476 1556
1477 if (count == 1) 1557 if (count == 1)
1478 { 1558 {
1479 sv = newSVsv (POPs); 1559 sv = newSVsv (POPs);
1480 FREETMPS; LEAVE; 1560 FREETMPS; LEAVE;
1481 return sv; 1561 return sv;
1482 } 1562 }
1563 else if (count)
1564 croak ("filter_json_object callbacks must not return more than one scalar");
1483 1565
1484 SvREFCNT_inc (sv); 1566 SvREFCNT_inc (sv);
1485 FREETMPS; LEAVE; 1567 FREETMPS; LEAVE;
1486 } 1568 }
1487 } 1569 }
… …
1544 if (!method) 1626 if (!method)
1545 ERR ("cannot decode perl-object (package does not have a THAW method)"); 1627 ERR ("cannot decode perl-object (package does not have a THAW method)");
1546 1628
1547 dSP; 1629 dSP;
1548 1630
1549 ENTER; SAVETMPS; PUSHMARK (SP); 1631 ENTER; SAVETMPS;
1632 PUSHMARK (SP);
1550 EXTEND (SP, len + 2); 1633 EXTEND (SP, len + 2);
1551 // we re-bless the reference to get overload and other niceties right 1634 // we re-bless the reference to get overload and other niceties right
1552 PUSHs (tag); 1635 PUSHs (tag);
1553 PUSHs (sv_json); 1636 PUSHs (sv_json);
1554 1637
… …
1591 case '-': 1674 case '-':
1592 case '0': case '1': case '2': case '3': case '4': 1675 case '0': case '1': case '2': case '3': case '4':
1593 case '5': case '6': case '7': case '8': case '9': 1676 case '5': case '6': case '7': case '8': case '9':
1594 return decode_num (dec); 1677 return decode_num (dec);
1595 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
1596 case 't': 1694 case 't':
1597 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1695 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1598 { 1696 {
1599 dec->cur += 4; 1697 dec->cur += 4;
1600#if JSON_SLOW 1698
1601 types_true = get_bool ("Types::Serialiser::true"); 1699 if (expect_false (!dec->json.v_true))
1602#endif 1700 dec->json.v_true = GET_BOOL (true);
1701
1603 return newSVsv (types_true); 1702 return newSVsv (dec->json.v_true);
1604 } 1703 }
1605 else 1704 else
1606 ERR ("'true' expected"); 1705 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 1706
1622 break; 1707 break;
1623 1708
1624 case 'n': 1709 case 'n':
1625 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4)) 1710 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4))
… …
1640fail: 1725fail:
1641 return 0; 1726 return 0;
1642} 1727}
1643 1728
1644static SV * 1729static SV *
1645decode_json (SV *string, JSON *json, char **offset_return) 1730decode_json (SV *string, JSON *json, STRLEN *offset_return)
1646{ 1731{
1647 dec_t dec; 1732 dec_t dec;
1648 SV *sv; 1733 SV *sv;
1649 1734
1650 /* work around bugs in 5.10 where manipulating magic values 1735 /* work around bugs in 5.10 where manipulating magic values
1651 * makes perl ignore the magic in subsequent accesses. 1736 * makes perl ignore the magic in subsequent accesses.
1652 * also make a copy of non-PV values, to get them into a clean 1737 * 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). 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.
1654 */ 1742 */
1655 /*SvGETMAGIC (string);*/ 1743 /*SvGETMAGIC (string);*/
1656 if (SvMAGICAL (string) || !SvPOK (string)) 1744 if (SvMAGICAL (string) || !SvPOK (string) || SvIsCOW_shared_hash (string))
1657 string = sv_2mortal (newSVsv (string)); 1745 string = sv_2mortal (newSVsv (string));
1658 1746
1659 SvUPGRADE (string, SVt_PV); 1747 SvUPGRADE (string, SVt_PV);
1660 1748
1661 /* work around a bug in perl 5.10, which causes SvCUR to fail an 1749 /* work around a bug in perl 5.10, which causes SvCUR to fail an
… …
1700 1788
1701 decode_ws (&dec); 1789 decode_ws (&dec);
1702 sv = decode_sv (&dec); 1790 sv = decode_sv (&dec);
1703 1791
1704 if (offset_return) 1792 if (offset_return)
1705 *offset_return = dec.cur; 1793 *offset_return = dec.cur - SvPVX (string);
1706 1794 else if (sv)
1707 if (!(offset_return || !sv))
1708 { 1795 {
1709 // check for trailing garbage 1796 // check for trailing garbage
1710 decode_ws (&dec); 1797 decode_ws (&dec);
1711 1798
1712 if (*dec.cur) 1799 if (*dec.cur)
… …
1736 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1823 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1737 } 1824 }
1738 1825
1739 sv = sv_2mortal (sv); 1826 sv = sv_2mortal (sv);
1740 1827
1741 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1828 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)"); 1829 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1743 1830
1744 return sv; 1831 return sv;
1745} 1832}
1746 1833
… …
1916 i >= '0' && i <= '9' ? i - '0' 2003 i >= '0' && i <= '9' ? i - '0'
1917 : i >= 'a' && i <= 'f' ? i - 'a' + 10 2004 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1918 : i >= 'A' && i <= 'F' ? i - 'A' + 10 2005 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1919 : -1; 2006 : -1;
1920 2007
1921 json_stash = gv_stashpv ("JSON::XS" , 1); 2008 json_stash = gv_stashpv ("JSON::XS" , 1);
1922 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1); 2009 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"); 2010 bool_false = get_bool ("Types::Serialiser::false");
2011 bool_true = get_bool ("Types::Serialiser::true");
1926 2012
1927 sv_json = newSVpv ("JSON", 0); 2013 sv_json = newSVpv ("JSON", 0);
1928 SvREADONLY_on (sv_json); 2014 SvREADONLY_on (sv_json);
1929 2015
1930 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */ 2016 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
… …
1932 2018
1933PROTOTYPES: DISABLE 2019PROTOTYPES: DISABLE
1934 2020
1935void CLONE (...) 2021void CLONE (...)
1936 CODE: 2022 CODE:
2023 // as long as these writes are atomic, the race should not matter
2024 // as existing threads either already use 0, or use the old value,
2025 // which is sitll correct for the initial thread.
1937 json_stash = 0; 2026 json_stash = 0;
1938 types_boolean_stash = 0; 2027 bool_stash = 0;
2028 bool_false = 0;
2029 bool_true = 0;
1939 2030
1940void new (char *klass) 2031void new (char *klass)
1941 PPCODE: 2032 PPCODE:
1942{ 2033{
1943 SV *pv = NEWSV (0, sizeof (JSON)); 2034 SV *pv = NEWSV (0, sizeof (JSON));
… …
1946 XPUSHs (sv_2mortal (sv_bless ( 2037 XPUSHs (sv_2mortal (sv_bless (
1947 newRV_noinc (pv), 2038 newRV_noinc (pv),
1948 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 2039 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1949 ))); 2040 )));
1950} 2041}
2042
2043void boolean_values (JSON *self, SV *v_false = 0, SV *v_true = 0)
2044 PPCODE:
2045 self->v_false = newSVsv (v_false);
2046 self->v_true = newSVsv (v_true);
2047 XPUSHs (ST (0));
2048
2049void get_boolean_values (JSON *self)
2050 PPCODE:
2051 if (self->v_false && self->v_true)
2052 {
2053 EXTEND (SP, 2);
2054 PUSHs (self->v_false);
2055 PUSHs (self->v_true);
2056 }
1951 2057
1952void ascii (JSON *self, int enable = 1) 2058void ascii (JSON *self, int enable = 1)
1953 ALIAS: 2059 ALIAS:
1954 ascii = F_ASCII 2060 ascii = F_ASCII
1955 latin1 = F_LATIN1 2061 latin1 = F_LATIN1
… …
2060 2166
2061void decode_prefix (JSON *self, SV *jsonstr) 2167void decode_prefix (JSON *self, SV *jsonstr)
2062 PPCODE: 2168 PPCODE:
2063{ 2169{
2064 SV *sv; 2170 SV *sv;
2065 char *offset; 2171 STRLEN offset;
2066 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN; 2172 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
2067 EXTEND (SP, 2); 2173 EXTEND (SP, 2);
2068 PUSHs (sv); 2174 PUSHs (sv);
2069 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset)))); 2175 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, SvPV_nolen (jsonstr) + offset))));
2070} 2176}
2071 2177
2072void incr_parse (JSON *self, SV *jsonstr = 0) 2178void incr_parse (JSON *self, SV *jsonstr = 0)
2073 PPCODE: 2179 PPCODE:
2074{ 2180{
… …
2108 { 2214 {
2109 STRLEN len; 2215 STRLEN len;
2110 const char *str = SvPV (jsonstr, len); 2216 const char *str = SvPV (jsonstr, len);
2111 STRLEN cur = SvCUR (self->incr_text); 2217 STRLEN cur = SvCUR (self->incr_text);
2112 2218
2113 if (SvLEN (self->incr_text) <= cur + len) 2219 if (SvLEN (self->incr_text) - cur <= len)
2114 SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 2220 json_sv_grow (self->incr_text, cur, len);
2115 2221
2116 Move (str, SvEND (self->incr_text), len, char); 2222 Move (str, SvEND (self->incr_text), len, char);
2117 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len); 2223 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 2224 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
2119 } 2225 }
… …
2121 2227
2122 if (GIMME_V != G_VOID) 2228 if (GIMME_V != G_VOID)
2123 do 2229 do
2124 { 2230 {
2125 SV *sv; 2231 SV *sv;
2126 char *offset; 2232 STRLEN offset;
2127 2233
2128 if (!INCR_DONE (self)) 2234 if (!INCR_DONE (self))
2129 { 2235 {
2130 incr_parse (self); 2236 incr_parse (self);
2131 2237
… …
2147 } 2253 }
2148 2254
2149 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN; 2255 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2150 XPUSHs (sv); 2256 XPUSHs (sv);
2151 2257
2152 self->incr_pos -= offset - SvPVX (self->incr_text); 2258 self->incr_pos -= offset;
2153 self->incr_nest = 0; 2259 self->incr_nest = 0;
2154 self->incr_mode = 0; 2260 self->incr_mode = 0;
2155 2261
2156 sv_chop (self->incr_text, offset); 2262 sv_chop (self->incr_text, SvPVX (self->incr_text) + offset);
2157 } 2263 }
2158 while (GIMME_V == G_ARRAY); 2264 while (GIMME_V == G_ARRAY);
2159} 2265}
2160 2266
2161SV *incr_text (JSON *self) 2267SV *incr_text (JSON *self)
… …
2192 self->incr_mode = 0; 2298 self->incr_mode = 0;
2193} 2299}
2194 2300
2195void DESTROY (JSON *self) 2301void DESTROY (JSON *self)
2196 CODE: 2302 CODE:
2303 SvREFCNT_dec (self->v_false);
2304 SvREFCNT_dec (self->v_true);
2197 SvREFCNT_dec (self->cb_sk_object); 2305 SvREFCNT_dec (self->cb_sk_object);
2198 SvREFCNT_dec (self->cb_object); 2306 SvREFCNT_dec (self->cb_object);
2199 SvREFCNT_dec (self->incr_text); 2307 SvREFCNT_dec (self->incr_text);
2200 2308
2201PROTOTYPES: ENABLE 2309PROTOTYPES: ENABLE

Diff Legend

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