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.120 by root, Mon Oct 28 23:23:10 2013 UTC vs.
Revision 1.135 by root, Thu Nov 15 20:49:12 2018 UTC

… …
6#include <string.h> 6#include <string.h>
7#include <stdlib.h> 7#include <stdlib.h>
8#include <stdio.h> 8#include <stdio.h>
9#include <limits.h> 9#include <limits.h>
10#include <float.h> 10#include <float.h>
11#include <inttypes.h>
11 12
12#if defined(__BORLANDC__) || defined(_MSC_VER) 13#if defined(__BORLANDC__) || defined(_MSC_VER)
13# define snprintf _snprintf // C compilers have this in stdio.h 14# define snprintf _snprintf // C compilers have this in stdio.h
14#endif 15#endif
15 16
16// some old perls do not have this, try to make it work, no 17// some old perls do not have this, try to make it work, no
17// guarantees, 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
21#endif
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
20#endif 32#endif
21 33
22// three extra for rounding, sign, and end of string 34// three extra for rounding, sign, and end of string
23#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3) 35#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3)
24 36
… …
38#define F_ALLOW_TAGS 0x00004000UL 50#define F_ALLOW_TAGS 0x00004000UL
39#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing 51#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
40 52
41#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 53#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
42 54
43#define INIT_SIZE 32 // initial scalar size to be allocated 55#define INIT_SIZE 64 // initial scalar size to be allocated
44#define INDENT_STEP 3 // spaces per indentation level 56#define INDENT_STEP 3 // spaces per indentation level
45 57
46#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
47 59
48#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8) 60#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8)
… …
66 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg))) 78 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
67 79
68#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?)"
69 81
70#ifdef USE_ITHREADS 82#ifdef USE_ITHREADS
71# define JSON_SLOW 1
72# 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))
73#else 86#else
74# define JSON_SLOW 0
75# define JSON_STASH json_stash 87# define JSON_STASH json_stash
88# define BOOL_STASH bool_stash
89# define GET_BOOL(value) bool_ ## value
76#endif 90#endif
77 91
78// 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
79#define STACK_HES 64 93#define STACK_HES 64
80 94
81static HV *json_stash, *types_boolean_stash; // JSON::XS:: 95static HV *json_stash, *bool_stash; // JSON::XS::, Types::Serialiser::Boolean::
82static SV *types_true, *types_false, *sv_json; 96static SV *bool_false, *bool_true;
97static SV *sv_json;
83 98
84enum { 99enum {
85 INCR_M_WS = 0, // initial whitespace skipping, must be 0 100 INCR_M_WS = 0, // initial whitespace skipping, must be 0
86 INCR_M_STR, // inside string 101 INCR_M_STR, // inside string
87 INCR_M_BS, // inside backslash 102 INCR_M_BS, // inside backslash
… …
103 // for the incremental parser 118 // for the incremental parser
104 SV *incr_text; // the source text so far 119 SV *incr_text; // the source text so far
105 STRLEN incr_pos; // the current offset into the text 120 STRLEN incr_pos; // the current offset into the text
106 int incr_nest; // {[]}-nesting level 121 int incr_nest; // {[]}-nesting level
107 unsigned char incr_mode; 122 unsigned char incr_mode;
123
124 SV *v_false, *v_true;
108} JSON; 125} JSON;
109 126
110INLINE void 127INLINE void
111json_init (JSON *json) 128json_init (JSON *json)
112{ 129{
113 Zero (json, 1, JSON); 130 static const JSON init = { F_ALLOW_NONREF, 512 };
114 json->max_depth = 512; 131
132 *json = init;
115} 133}
116 134
117///////////////////////////////////////////////////////////////////////////// 135/////////////////////////////////////////////////////////////////////////////
118// utility functions 136// utility functions
119 137
… …
141 SvPV_renew (sv, SvCUR (sv) + 1); 159 SvPV_renew (sv, SvCUR (sv) + 1);
142#endif 160#endif
143 } 161 }
144} 162}
145 163
164/* adds two STRLENs together, slow, and with paranoia */
165STRLEN
166strlen_sum (STRLEN l1, STRLEN l2)
167{
168 size_t sum = l1 + l2;
169
170 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum)
171 croak ("JSON::XS: string size overflow");
172
173 return sum;
174}
175
176/* similar to SvGROW, but somewhat safer and guarantees exponential realloc strategy */
177static char *
178json_sv_grow (SV *sv, size_t len1, size_t len2)
179{
180 len1 = strlen_sum (len1, len2);
181 len1 = strlen_sum (len1, len1 >> 1);
182
183 if (len1 > 4096 - 24)
184 len1 = (len1 | 4095) - 24;
185
186 return SvGROW (sv, len1);
187}
188
146// decode an utf-8 character and return it, or (UV)-1 in 189// decode a utf-8 character and return it, or (UV)-1 in
147// case of an error. 190// case of an error.
148// we special-case "safe" characters from U+80 .. U+7FF, 191// we special-case "safe" characters from U+80 .. U+7FF,
149// but use the very good perl function to parse anything else. 192// but use the very good perl function to parse anything else.
150// note that we never call this function for a ascii codepoints 193// note that we never call this function for a ascii codepoints
151INLINE UV 194INLINE UV
… …
288 // a recursion depth of ten gives us >>500 bits 331 // a recursion depth of ten gives us >>500 bits
289 json_atof_scan1 (s, &accum, &expo, 0, 10); 332 json_atof_scan1 (s, &accum, &expo, 0, 10);
290 333
291 return neg ? -accum : accum; 334 return neg ? -accum : accum;
292} 335}
336
337// target of scalar reference is bool? -1 == nope, 0 == false, 1 == true
338static int
339ref_bool_type (SV *sv)
340{
341 svtype svt = SvTYPE (sv);
342
343 if (svt < SVt_PVAV)
344 {
345 STRLEN len = 0;
346 char *pv = svt ? SvPV (sv, len) : 0;
347
348 if (len == 1)
349 if (*pv == '1')
350 return 1;
351 else if (*pv == '0')
352 return 0;
353 }
354
355 return -1;
356}
357
358// returns whether scalar is not a reference in the sense of allow_nonref
359static int
360json_nonref (SV *scalar)
361{
362 if (!SvROK (scalar))
363 return 1;
364
365 scalar = SvRV (scalar);
366
367 if (SvTYPE (scalar) >= SVt_PVMG)
368 {
369 if (SvSTASH (scalar) == bool_stash)
370 return 1;
371
372 if (!SvOBJECT (scalar) && ref_bool_type (scalar) >= 0)
373 return 1;
374 }
375
376 return 0;
377}
378
293///////////////////////////////////////////////////////////////////////////// 379/////////////////////////////////////////////////////////////////////////////
294// encoder 380// encoder
295 381
296// structure used for encoding JSON 382// structure used for encoding JSON
297typedef struct 383typedef struct
… …
305} enc_t; 391} enc_t;
306 392
307INLINE void 393INLINE void
308need (enc_t *enc, STRLEN len) 394need (enc_t *enc, STRLEN len)
309{ 395{
310 if (expect_false (enc->cur + len >= enc->end)) 396 if (expect_false ((uintptr_t)(enc->end - enc->cur) < len))
311 { 397 {
312 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 398 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
313 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 399 char *buf = json_sv_grow (enc->sv, cur, len);
314 enc->cur = SvPVX (enc->sv) + cur; 400 enc->cur = buf + cur;
315 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 401 enc->end = buf + SvLEN (enc->sv) - 1;
316 } 402 }
317} 403}
318 404
319INLINE void 405INLINE void
320encode_ch (enc_t *enc, char ch) 406encode_ch (enc_t *enc, char ch)
… …
336 422
337 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case 423 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case
338 { 424 {
339 if (expect_false (ch == '"')) // but with slow exceptions 425 if (expect_false (ch == '"')) // but with slow exceptions
340 { 426 {
341 need (enc, len += 1); 427 need (enc, len + 1);
342 *enc->cur++ = '\\'; 428 *enc->cur++ = '\\';
343 *enc->cur++ = '"'; 429 *enc->cur++ = '"';
344 } 430 }
345 else if (expect_false (ch == '\\')) 431 else if (expect_false (ch == '\\'))
346 { 432 {
347 need (enc, len += 1); 433 need (enc, len + 1);
348 *enc->cur++ = '\\'; 434 *enc->cur++ = '\\';
349 *enc->cur++ = '\\'; 435 *enc->cur++ = '\\';
350 } 436 }
351 else 437 else
352 *enc->cur++ = ch; 438 *enc->cur++ = ch;
… …
355 } 441 }
356 else 442 else
357 { 443 {
358 switch (ch) 444 switch (ch)
359 { 445 {
360 case '\010': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'b'; ++str; break; 446 case '\010': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 'b'; ++str; break;
361 case '\011': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 't'; ++str; break; 447 case '\011': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 't'; ++str; break;
362 case '\012': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'n'; ++str; break; 448 case '\012': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 'n'; ++str; break;
363 case '\014': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'f'; ++str; break; 449 case '\014': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 'f'; ++str; break;
364 case '\015': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'r'; ++str; break; 450 case '\015': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 'r'; ++str; break;
365 451
366 default: 452 default:
367 { 453 {
368 STRLEN clen; 454 STRLEN clen;
369 UV uch; 455 UV uch;
… …
385 if (uch >= 0x10000UL) 471 if (uch >= 0x10000UL)
386 { 472 {
387 if (uch >= 0x110000UL) 473 if (uch >= 0x110000UL)
388 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch); 474 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
389 475
390 need (enc, len += 11); 476 need (enc, len + 11);
391 sprintf (enc->cur, "\\u%04x\\u%04x", 477 sprintf (enc->cur, "\\u%04x\\u%04x",
392 (int)((uch - 0x10000) / 0x400 + 0xD800), 478 (int)((uch - 0x10000) / 0x400 + 0xD800),
393 (int)((uch - 0x10000) % 0x400 + 0xDC00)); 479 (int)((uch - 0x10000) % 0x400 + 0xDC00));
394 enc->cur += 12; 480 enc->cur += 12;
395 } 481 }
396 else 482 else
397 { 483 {
398 need (enc, len += 5); 484 need (enc, len + 5);
399 *enc->cur++ = '\\'; 485 *enc->cur++ = '\\';
400 *enc->cur++ = 'u'; 486 *enc->cur++ = 'u';
401 *enc->cur++ = PL_hexdigit [ uch >> 12 ]; 487 *enc->cur++ = PL_hexdigit [ uch >> 12 ];
402 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15]; 488 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
403 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15]; 489 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
… …
411 *enc->cur++ = uch; 497 *enc->cur++ = uch;
412 str += clen; 498 str += clen;
413 } 499 }
414 else if (is_utf8) 500 else if (is_utf8)
415 { 501 {
416 need (enc, len += clen); 502 need (enc, len + clen);
417 do 503 do
418 { 504 {
419 *enc->cur++ = *str++; 505 *enc->cur++ = *str++;
420 } 506 }
421 while (--clen); 507 while (--clen);
422 } 508 }
423 else 509 else
424 { 510 {
425 need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed 511 need (enc, len + UTF8_MAXBYTES - 1); // never more than 11 bytes needed
426 enc->cur = encode_utf8 (enc->cur, uch); 512 enc->cur = encode_utf8 (enc->cur, uch);
427 ++str; 513 ++str;
428 } 514 }
429 } 515 }
430 } 516 }
… …
690 SvGETMAGIC (sv); 776 SvGETMAGIC (sv);
691 svt = SvTYPE (sv); 777 svt = SvTYPE (sv);
692 778
693 if (expect_false (SvOBJECT (sv))) 779 if (expect_false (SvOBJECT (sv)))
694 { 780 {
695 HV *boolean_stash = !JSON_SLOW || types_boolean_stash
696 ? types_boolean_stash
697 : gv_stashpv ("Types::Serialiser::Boolean", 1);
698 HV *stash = SvSTASH (sv); 781 HV *stash = SvSTASH (sv);
699 782
700 if (stash == boolean_stash) 783 if (stash == bool_stash)
701 { 784 {
702 if (SvIV (sv))
703 encode_str (enc, "true", 4, 0); 785 if (SvIV (sv)) encode_str (enc, "true" , 4, 0);
704 else
705 encode_str (enc, "false", 5, 0); 786 else encode_str (enc, "false", 5, 0);
706 } 787 }
707 else if ((enc->json.flags & F_ALLOW_TAGS) && (method = gv_fetchmethod_autoload (stash, "FREEZE", 0))) 788 else if ((enc->json.flags & F_ALLOW_TAGS) && (method = gv_fetchmethod_autoload (stash, "FREEZE", 0)))
708 { 789 {
709 int count; 790 int count;
710 dSP; 791 dSP;
711 792
712 ENTER; SAVETMPS; PUSHMARK (SP); 793 ENTER; SAVETMPS;
794 PUSHMARK (SP);
713 EXTEND (SP, 2); 795 EXTEND (SP, 2);
714 // 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
715 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 797 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
716 PUSHs (sv_json); 798 PUSHs (sv_json);
717 799
… …
719 count = call_sv ((SV *)GvCV (method), G_ARRAY); 801 count = call_sv ((SV *)GvCV (method), G_ARRAY);
720 SPAGAIN; 802 SPAGAIN;
721 803
722 // catch this surprisingly common error 804 // catch this surprisingly common error
723 if (SvROK (TOPs) && SvRV (TOPs) == sv) 805 if (SvROK (TOPs) && SvRV (TOPs) == sv)
724 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv))); 806 croak ("%s::FREEZE method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
725 807
726 encode_ch (enc, '('); 808 encode_ch (enc, '(');
727 encode_ch (enc, '"'); 809 encode_ch (enc, '"');
728 encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash)); 810 encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
729 encode_ch (enc, '"'); 811 encode_ch (enc, '"');
730 encode_ch (enc, ')'); 812 encode_ch (enc, ')');
731 encode_ch (enc, '['); 813 encode_ch (enc, '[');
732 814
733 while (count) 815 if (count)
734 { 816 {
817 int i;
818
819 for (i = 0; i < count - 1; ++i)
820 {
735 encode_sv (enc, SP[1 - count--]); 821 encode_sv (enc, SP[i + 1 - count]);
736
737 if (count)
738 encode_ch (enc, ','); 822 encode_ch (enc, ',');
823 }
824
825 encode_sv (enc, TOPs);
826 SP -= count;
739 } 827 }
740 828
741 encode_ch (enc, ']'); 829 encode_ch (enc, ']');
742
743 PUTBACK;
744 830
745 FREETMPS; LEAVE; 831 FREETMPS; LEAVE;
746 } 832 }
747 else if ((enc->json.flags & F_CONV_BLESSED) && (method = gv_fetchmethod_autoload (stash, "TO_JSON", 0))) 833 else if ((enc->json.flags & F_CONV_BLESSED) && (method = gv_fetchmethod_autoload (stash, "TO_JSON", 0)))
748 { 834 {
749 dSP; 835 dSP;
750 836
751 ENTER; SAVETMPS; PUSHMARK (SP); 837 ENTER; SAVETMPS;
838 PUSHMARK (SP);
752 // we re-bless the reference to get overload and other niceties right 839 // we re-bless the reference to get overload and other niceties right
753 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 840 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
754 841
755 // calling with G_SCALAR ensures that we always get a 1 return value 842 // calling with G_SCALAR ensures that we always get a 1 return value
756 PUTBACK; 843 PUTBACK;
… …
778 encode_hv (enc, (HV *)sv); 865 encode_hv (enc, (HV *)sv);
779 else if (svt == SVt_PVAV) 866 else if (svt == SVt_PVAV)
780 encode_av (enc, (AV *)sv); 867 encode_av (enc, (AV *)sv);
781 else if (svt < SVt_PVAV) 868 else if (svt < SVt_PVAV)
782 { 869 {
783 STRLEN len = 0; 870 int bool_type = ref_bool_type (sv);
784 char *pv = svt ? SvPV (sv, len) : 0;
785 871
786 if (len == 1 && *pv == '1') 872 if (bool_type == 1)
787 encode_str (enc, "true", 4, 0); 873 encode_str (enc, "true", 4, 0);
788 else if (len == 1 && *pv == '0') 874 else if (bool_type == 0)
789 encode_str (enc, "false", 5, 0); 875 encode_str (enc, "false", 5, 0);
790 else if (enc->json.flags & F_ALLOW_UNKNOWN) 876 else if (enc->json.flags & F_ALLOW_UNKNOWN)
791 encode_str (enc, "null", 4, 0); 877 encode_str (enc, "null", 4, 0);
792 else 878 else
793 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 879 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
… …
876static SV * 962static SV *
877encode_json (SV *scalar, JSON *json) 963encode_json (SV *scalar, JSON *json)
878{ 964{
879 enc_t enc; 965 enc_t enc;
880 966
881 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar)) 967 if (!(json->flags & F_ALLOW_NONREF) && json_nonref (scalar))
882 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)"); 968 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
883 969
884 enc.json = *json; 970 enc.json = *json;
885 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 971 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
886 enc.cur = SvPVX (enc.sv); 972 enc.cur = SvPVX (enc.sv);
… …
1093 *cur++ = *dec_cur++; 1179 *cur++ = *dec_cur++;
1094 while (--clen); 1180 while (--clen);
1095 1181
1096 utf8 = 1; 1182 utf8 = 1;
1097 } 1183 }
1184 else if (ch == '\t' && dec->json.flags & F_RELAXED)
1185 *cur++ = ch;
1098 else 1186 else
1099 { 1187 {
1100 --dec_cur; 1188 --dec_cur;
1101 1189
1102 if (!ch) 1190 if (!ch)
… …
1112 1200
1113 if (sv) 1201 if (sv)
1114 { 1202 {
1115 STRLEN cur = SvCUR (sv); 1203 STRLEN cur = SvCUR (sv);
1116 1204
1117 if (SvLEN (sv) <= cur + len) 1205 if (SvLEN (sv) - cur <= len)
1118 SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 1206 json_sv_grow (sv, cur, len);
1119 1207
1120 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 1208 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
1121 SvCUR_set (sv, SvCUR (sv) + len); 1209 SvCUR_set (sv, SvCUR (sv) + len);
1122 } 1210 }
1123 else 1211 else
… …
1424 1512
1425 hv_iterinit (hv); 1513 hv_iterinit (hv);
1426 he = hv_iternext (hv); 1514 he = hv_iternext (hv);
1427 hv_iterinit (hv); 1515 hv_iterinit (hv);
1428 1516
1429 // the next line creates a mortal sv each time its called. 1517 // the next line creates a mortal sv each time it's called.
1430 // might want to optimise this for common cases. 1518 // might want to optimise this for common cases.
1431 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0); 1519 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
1432 1520
1433 if (cb) 1521 if (cb)
1434 { 1522 {
1435 dSP; 1523 dSP;
1436 int count; 1524 int count;
1437 1525
1438 ENTER; SAVETMPS; PUSHMARK (SP); 1526 ENTER; SAVETMPS;
1527 PUSHMARK (SP);
1439 XPUSHs (HeVAL (he)); 1528 XPUSHs (HeVAL (he));
1440 sv_2mortal (sv); 1529 sv_2mortal (sv);
1441 1530
1442 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1531 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1443 1532
… …
1445 { 1534 {
1446 sv = newSVsv (POPs); 1535 sv = newSVsv (POPs);
1447 FREETMPS; LEAVE; 1536 FREETMPS; LEAVE;
1448 return sv; 1537 return sv;
1449 } 1538 }
1539 else if (count)
1540 croak ("filter_json_single_key_object callbacks must not return more than one scalar");
1450 1541
1451 SvREFCNT_inc (sv); 1542 SvREFCNT_inc (sv);
1452 FREETMPS; LEAVE; 1543 FREETMPS; LEAVE;
1453 } 1544 }
1454 } 1545 }
… …
1456 if (dec->json.cb_object) 1547 if (dec->json.cb_object)
1457 { 1548 {
1458 dSP; 1549 dSP;
1459 int count; 1550 int count;
1460 1551
1461 ENTER; SAVETMPS; PUSHMARK (SP); 1552 ENTER; SAVETMPS;
1553 PUSHMARK (SP);
1462 XPUSHs (sv_2mortal (sv)); 1554 XPUSHs (sv_2mortal (sv));
1463 1555
1464 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN; 1556 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1465 1557
1466 if (count == 1) 1558 if (count == 1)
1467 { 1559 {
1468 sv = newSVsv (POPs); 1560 sv = newSVsv (POPs);
1469 FREETMPS; LEAVE; 1561 FREETMPS; LEAVE;
1470 return sv; 1562 return sv;
1471 } 1563 }
1564 else if (count)
1565 croak ("filter_json_object callbacks must not return more than one scalar");
1472 1566
1473 SvREFCNT_inc (sv); 1567 SvREFCNT_inc (sv);
1474 FREETMPS; LEAVE; 1568 FREETMPS; LEAVE;
1475 } 1569 }
1476 } 1570 }
… …
1492 if (!(dec->json.flags & F_ALLOW_TAGS)) 1586 if (!(dec->json.flags & F_ALLOW_TAGS))
1493 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1587 ERR ("malformed JSON string, neither array, object, number, string or atom");
1494 1588
1495 ++dec->cur; 1589 ++dec->cur;
1496 1590
1591 decode_ws (dec);
1592
1497 tag = decode_sv (dec); 1593 tag = decode_sv (dec);
1498 if (!tag) 1594 if (!tag)
1499 goto fail; 1595 goto fail;
1500 1596
1501 if (!SvPOK (tag)) 1597 if (!SvPOK (tag))
1502 ERR ("malformed JSON string, (tag) must be a string"); 1598 ERR ("malformed JSON string, (tag) must be a string");
1503 1599
1600 decode_ws (dec);
1601
1504 if (*dec->cur != ')') 1602 if (*dec->cur != ')')
1505 ERR (") expected after tag"); 1603 ERR (") expected after tag");
1506 1604
1507 ++dec->cur; 1605 ++dec->cur;
1606
1607 decode_ws (dec);
1508 1608
1509 val = decode_sv (dec); 1609 val = decode_sv (dec);
1510 if (!val) 1610 if (!val)
1511 goto fail; 1611 goto fail;
1512 1612
… …
1527 if (!method) 1627 if (!method)
1528 ERR ("cannot decode perl-object (package does not have a THAW method)"); 1628 ERR ("cannot decode perl-object (package does not have a THAW method)");
1529 1629
1530 dSP; 1630 dSP;
1531 1631
1532 ENTER; SAVETMPS; PUSHMARK (SP); 1632 ENTER; SAVETMPS;
1633 PUSHMARK (SP);
1533 EXTEND (SP, len + 2); 1634 EXTEND (SP, len + 2);
1534 // we re-bless the reference to get overload and other niceties right 1635 // we re-bless the reference to get overload and other niceties right
1535 PUSHs (tag); 1636 PUSHs (tag);
1536 PUSHs (sv_json); 1637 PUSHs (sv_json);
1537 1638
… …
1574 case '-': 1675 case '-':
1575 case '0': case '1': case '2': case '3': case '4': 1676 case '0': case '1': case '2': case '3': case '4':
1576 case '5': case '6': case '7': case '8': case '9': 1677 case '5': case '6': case '7': case '8': case '9':
1577 return decode_num (dec); 1678 return decode_num (dec);
1578 1679
1680 case 'f':
1681 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1682 {
1683 dec->cur += 5;
1684
1685 if (expect_false (!dec->json.v_false))
1686 dec->json.v_false = GET_BOOL (false);
1687
1688 return newSVsv (dec->json.v_false);
1689 }
1690 else
1691 ERR ("'false' expected");
1692
1693 break;
1694
1579 case 't': 1695 case 't':
1580 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1696 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1581 { 1697 {
1582 dec->cur += 4; 1698 dec->cur += 4;
1583#if JSON_SLOW 1699
1584 types_true = get_bool ("Types::Serialiser::true"); 1700 if (expect_false (!dec->json.v_true))
1585#endif 1701 dec->json.v_true = GET_BOOL (true);
1702
1586 return newSVsv (types_true); 1703 return newSVsv (dec->json.v_true);
1587 } 1704 }
1588 else 1705 else
1589 ERR ("'true' expected"); 1706 ERR ("'true' expected");
1590
1591 break;
1592
1593 case 'f':
1594 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1595 {
1596 dec->cur += 5;
1597#if JSON_SLOW
1598 types_false = get_bool ("Types::Serialiser::false");
1599#endif
1600 return newSVsv (types_false);
1601 }
1602 else
1603 ERR ("'false' expected");
1604 1707
1605 break; 1708 break;
1606 1709
1607 case 'n': 1710 case 'n':
1608 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4)) 1711 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4))
… …
1623fail: 1726fail:
1624 return 0; 1727 return 0;
1625} 1728}
1626 1729
1627static SV * 1730static SV *
1628decode_json (SV *string, JSON *json, char **offset_return) 1731decode_json (SV *string, JSON *json, STRLEN *offset_return)
1629{ 1732{
1630 dec_t dec; 1733 dec_t dec;
1631 SV *sv; 1734 SV *sv;
1632 1735
1633 /* work around bugs in 5.10 where manipulating magic values 1736 /* work around bugs in 5.10 where manipulating magic values
1634 * makes perl ignore the magic in subsequent accesses. 1737 * makes perl ignore the magic in subsequent accesses.
1635 * also make a copy of non-PV values, to get them into a clean 1738 * also make a copy of non-PV values, to get them into a clean
1636 * state (SvPV should do that, but it's buggy, see below). 1739 * state (SvPV should do that, but it's buggy, see below).
1740 *
1741 * SvIsCOW_shared_hash works around a bug in perl (possibly 5.16),
1742 * as reported by Reini Urban.
1637 */ 1743 */
1638 /*SvGETMAGIC (string);*/ 1744 /*SvGETMAGIC (string);*/
1639 if (SvMAGICAL (string) || !SvPOK (string)) 1745 if (SvMAGICAL (string) || !SvPOK (string) || SvIsCOW_shared_hash (string))
1640 string = sv_2mortal (newSVsv (string)); 1746 string = sv_2mortal (newSVsv (string));
1641 1747
1642 SvUPGRADE (string, SVt_PV); 1748 SvUPGRADE (string, SVt_PV);
1643 1749
1644 /* work around a bug in perl 5.10, which causes SvCUR to fail an 1750 /* work around a bug in perl 5.10, which causes SvCUR to fail an
… …
1683 1789
1684 decode_ws (&dec); 1790 decode_ws (&dec);
1685 sv = decode_sv (&dec); 1791 sv = decode_sv (&dec);
1686 1792
1687 if (offset_return) 1793 if (offset_return)
1688 *offset_return = dec.cur; 1794 *offset_return = dec.cur - SvPVX (string);
1689 1795 else if (sv)
1690 if (!(offset_return || !sv))
1691 { 1796 {
1692 // check for trailing garbage 1797 // check for trailing garbage
1693 decode_ws (&dec); 1798 decode_ws (&dec);
1694 1799
1695 if (*dec.cur) 1800 if (dec.cur != dec.end)
1696 { 1801 {
1697 dec.err = "garbage after JSON object"; 1802 dec.err = "garbage after JSON object";
1698 SvREFCNT_dec (sv); 1803 SvREFCNT_dec (sv);
1699 sv = 0; 1804 sv = 0;
1700 } 1805 }
… …
1719 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1824 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1720 } 1825 }
1721 1826
1722 sv = sv_2mortal (sv); 1827 sv = sv_2mortal (sv);
1723 1828
1724 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1829 if (!(dec.json.flags & F_ALLOW_NONREF) && json_nonref (sv))
1725 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)"); 1830 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1726 1831
1727 return sv; 1832 return sv;
1728} 1833}
1729 1834
… …
1899 i >= '0' && i <= '9' ? i - '0' 2004 i >= '0' && i <= '9' ? i - '0'
1900 : i >= 'a' && i <= 'f' ? i - 'a' + 10 2005 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1901 : i >= 'A' && i <= 'F' ? i - 'A' + 10 2006 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1902 : -1; 2007 : -1;
1903 2008
1904 json_stash = gv_stashpv ("JSON::XS" , 1); 2009 json_stash = gv_stashpv ("JSON::XS" , 1);
1905 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1); 2010 bool_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1906
1907 types_true = get_bool ("Types::Serialiser::true");
1908 types_false = get_bool ("Types::Serialiser::false"); 2011 bool_false = get_bool ("Types::Serialiser::false");
2012 bool_true = get_bool ("Types::Serialiser::true");
1909 2013
1910 sv_json = newSVpv ("JSON", 0); 2014 sv_json = newSVpv ("JSON", 0);
1911 SvREADONLY_on (sv_json); 2015 SvREADONLY_on (sv_json);
1912 2016
1913 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */ 2017 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
… …
1915 2019
1916PROTOTYPES: DISABLE 2020PROTOTYPES: DISABLE
1917 2021
1918void CLONE (...) 2022void CLONE (...)
1919 CODE: 2023 CODE:
2024 // as long as these writes are atomic, the race should not matter
2025 // as existing threads either already use 0, or use the old value,
2026 // which is sitll correct for the initial thread.
1920 json_stash = 0; 2027 json_stash = 0;
1921 types_boolean_stash = 0; 2028 bool_stash = 0;
2029 bool_false = 0;
2030 bool_true = 0;
1922 2031
1923void new (char *klass) 2032void new (char *klass)
1924 PPCODE: 2033 PPCODE:
1925{ 2034{
1926 SV *pv = NEWSV (0, sizeof (JSON)); 2035 SV *pv = NEWSV (0, sizeof (JSON));
… …
1929 XPUSHs (sv_2mortal (sv_bless ( 2038 XPUSHs (sv_2mortal (sv_bless (
1930 newRV_noinc (pv), 2039 newRV_noinc (pv),
1931 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 2040 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1932 ))); 2041 )));
1933} 2042}
2043
2044void boolean_values (JSON *self, SV *v_false = 0, SV *v_true = 0)
2045 PPCODE:
2046 self->v_false = newSVsv (v_false);
2047 self->v_true = newSVsv (v_true);
2048 XPUSHs (ST (0));
2049
2050void get_boolean_values (JSON *self)
2051 PPCODE:
2052 if (self->v_false && self->v_true)
2053 {
2054 EXTEND (SP, 2);
2055 PUSHs (self->v_false);
2056 PUSHs (self->v_true);
2057 }
1934 2058
1935void ascii (JSON *self, int enable = 1) 2059void ascii (JSON *self, int enable = 1)
1936 ALIAS: 2060 ALIAS:
1937 ascii = F_ASCII 2061 ascii = F_ASCII
1938 latin1 = F_LATIN1 2062 latin1 = F_LATIN1
… …
2043 2167
2044void decode_prefix (JSON *self, SV *jsonstr) 2168void decode_prefix (JSON *self, SV *jsonstr)
2045 PPCODE: 2169 PPCODE:
2046{ 2170{
2047 SV *sv; 2171 SV *sv;
2048 char *offset; 2172 STRLEN offset;
2049 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN; 2173 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
2050 EXTEND (SP, 2); 2174 EXTEND (SP, 2);
2051 PUSHs (sv); 2175 PUSHs (sv);
2052 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset)))); 2176 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, SvPV_nolen (jsonstr) + offset))));
2053} 2177}
2054 2178
2055void incr_parse (JSON *self, SV *jsonstr = 0) 2179void incr_parse (JSON *self, SV *jsonstr = 0)
2056 PPCODE: 2180 PPCODE:
2057{ 2181{
… …
2091 { 2215 {
2092 STRLEN len; 2216 STRLEN len;
2093 const char *str = SvPV (jsonstr, len); 2217 const char *str = SvPV (jsonstr, len);
2094 STRLEN cur = SvCUR (self->incr_text); 2218 STRLEN cur = SvCUR (self->incr_text);
2095 2219
2096 if (SvLEN (self->incr_text) <= cur + len) 2220 if (SvLEN (self->incr_text) - cur <= len)
2097 SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 2221 json_sv_grow (self->incr_text, cur, len);
2098 2222
2099 Move (str, SvEND (self->incr_text), len, char); 2223 Move (str, SvEND (self->incr_text), len, char);
2100 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len); 2224 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
2101 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there 2225 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
2102 } 2226 }
… …
2104 2228
2105 if (GIMME_V != G_VOID) 2229 if (GIMME_V != G_VOID)
2106 do 2230 do
2107 { 2231 {
2108 SV *sv; 2232 SV *sv;
2109 char *offset; 2233 STRLEN offset;
2110 2234
2111 if (!INCR_DONE (self)) 2235 if (!INCR_DONE (self))
2112 { 2236 {
2113 incr_parse (self); 2237 incr_parse (self);
2114 2238
… …
2130 } 2254 }
2131 2255
2132 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN; 2256 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2133 XPUSHs (sv); 2257 XPUSHs (sv);
2134 2258
2135 self->incr_pos -= offset - SvPVX (self->incr_text); 2259 self->incr_pos -= offset;
2136 self->incr_nest = 0; 2260 self->incr_nest = 0;
2137 self->incr_mode = 0; 2261 self->incr_mode = 0;
2138 2262
2139 sv_chop (self->incr_text, offset); 2263 sv_chop (self->incr_text, SvPVX (self->incr_text) + offset);
2140 } 2264 }
2141 while (GIMME_V == G_ARRAY); 2265 while (GIMME_V == G_ARRAY);
2142} 2266}
2143 2267
2144SV *incr_text (JSON *self) 2268SV *incr_text (JSON *self)
… …
2175 self->incr_mode = 0; 2299 self->incr_mode = 0;
2176} 2300}
2177 2301
2178void DESTROY (JSON *self) 2302void DESTROY (JSON *self)
2179 CODE: 2303 CODE:
2304 SvREFCNT_dec (self->v_false);
2305 SvREFCNT_dec (self->v_true);
2180 SvREFCNT_dec (self->cb_sk_object); 2306 SvREFCNT_dec (self->cb_sk_object);
2181 SvREFCNT_dec (self->cb_object); 2307 SvREFCNT_dec (self->cb_object);
2182 SvREFCNT_dec (self->incr_text); 2308 SvREFCNT_dec (self->incr_text);
2183 2309
2184PROTOTYPES: ENABLE 2310PROTOTYPES: ENABLE

Diff Legend

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