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.119 by root, Mon Oct 28 23:19:54 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
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
… …
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{
… …
141 SvPV_renew (sv, SvCUR (sv) + 1); 158 SvPV_renew (sv, SvCUR (sv) + 1);
142#endif 159#endif
143 } 160 }
144} 161}
145 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
146// 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
147// case of an error. 189// case of an error.
148// we special-case "safe" characters from U+80 .. U+7FF, 190// we special-case "safe" characters from U+80 .. U+7FF,
149// but use the very good perl function to parse anything else. 191// but use the very good perl function to parse anything else.
150// note that we never call this function for a ascii codepoints 192// note that we never call this function for a ascii codepoints
151INLINE UV 193INLINE UV
… …
288 // a recursion depth of ten gives us >>500 bits 330 // a recursion depth of ten gives us >>500 bits
289 json_atof_scan1 (s, &accum, &expo, 0, 10); 331 json_atof_scan1 (s, &accum, &expo, 0, 10);
290 332
291 return neg ? -accum : accum; 333 return neg ? -accum : accum;
292} 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
293///////////////////////////////////////////////////////////////////////////// 378/////////////////////////////////////////////////////////////////////////////
294// encoder 379// encoder
295 380
296// structure used for encoding JSON 381// structure used for encoding JSON
297typedef struct 382typedef struct
… …
305} enc_t; 390} enc_t;
306 391
307INLINE void 392INLINE void
308need (enc_t *enc, STRLEN len) 393need (enc_t *enc, STRLEN len)
309{ 394{
310 if (expect_false (enc->cur + len >= enc->end)) 395 if (expect_false ((uintptr_t)(enc->end - enc->cur) < len))
311 { 396 {
312 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 397 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
313 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 398 char *buf = json_sv_grow (enc->sv, cur, len);
314 enc->cur = SvPVX (enc->sv) + cur; 399 enc->cur = buf + cur;
315 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 400 enc->end = buf + SvLEN (enc->sv) - 1;
316 } 401 }
317} 402}
318 403
319INLINE void 404INLINE void
320encode_ch (enc_t *enc, char ch) 405encode_ch (enc_t *enc, char ch)
… …
336 421
337 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case 422 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case
338 { 423 {
339 if (expect_false (ch == '"')) // but with slow exceptions 424 if (expect_false (ch == '"')) // but with slow exceptions
340 { 425 {
341 need (enc, len += 1); 426 need (enc, len + 1);
342 *enc->cur++ = '\\'; 427 *enc->cur++ = '\\';
343 *enc->cur++ = '"'; 428 *enc->cur++ = '"';
344 } 429 }
345 else if (expect_false (ch == '\\')) 430 else if (expect_false (ch == '\\'))
346 { 431 {
347 need (enc, len += 1); 432 need (enc, len + 1);
348 *enc->cur++ = '\\'; 433 *enc->cur++ = '\\';
349 *enc->cur++ = '\\'; 434 *enc->cur++ = '\\';
350 } 435 }
351 else 436 else
352 *enc->cur++ = ch; 437 *enc->cur++ = ch;
… …
355 } 440 }
356 else 441 else
357 { 442 {
358 switch (ch) 443 switch (ch)
359 { 444 {
360 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;
361 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;
362 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;
363 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;
364 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;
365 450
366 default: 451 default:
367 { 452 {
368 STRLEN clen; 453 STRLEN clen;
369 UV uch; 454 UV uch;
… …
385 if (uch >= 0x10000UL) 470 if (uch >= 0x10000UL)
386 { 471 {
387 if (uch >= 0x110000UL) 472 if (uch >= 0x110000UL)
388 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);
389 474
390 need (enc, len += 11); 475 need (enc, len + 11);
391 sprintf (enc->cur, "\\u%04x\\u%04x", 476 sprintf (enc->cur, "\\u%04x\\u%04x",
392 (int)((uch - 0x10000) / 0x400 + 0xD800), 477 (int)((uch - 0x10000) / 0x400 + 0xD800),
393 (int)((uch - 0x10000) % 0x400 + 0xDC00)); 478 (int)((uch - 0x10000) % 0x400 + 0xDC00));
394 enc->cur += 12; 479 enc->cur += 12;
395 } 480 }
396 else 481 else
397 { 482 {
398 need (enc, len += 5); 483 need (enc, len + 5);
399 *enc->cur++ = '\\'; 484 *enc->cur++ = '\\';
400 *enc->cur++ = 'u'; 485 *enc->cur++ = 'u';
401 *enc->cur++ = PL_hexdigit [ uch >> 12 ]; 486 *enc->cur++ = PL_hexdigit [ uch >> 12 ];
402 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15]; 487 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
403 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15]; 488 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
… …
411 *enc->cur++ = uch; 496 *enc->cur++ = uch;
412 str += clen; 497 str += clen;
413 } 498 }
414 else if (is_utf8) 499 else if (is_utf8)
415 { 500 {
416 need (enc, len += clen); 501 need (enc, len + clen);
417 do 502 do
418 { 503 {
419 *enc->cur++ = *str++; 504 *enc->cur++ = *str++;
420 } 505 }
421 while (--clen); 506 while (--clen);
422 } 507 }
423 else 508 else
424 { 509 {
425 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
426 enc->cur = encode_utf8 (enc->cur, uch); 511 enc->cur = encode_utf8 (enc->cur, uch);
427 ++str; 512 ++str;
428 } 513 }
429 } 514 }
430 } 515 }
… …
683// encode objects, arrays and special \0=false and \1=true values. 768// encode objects, arrays and special \0=false and \1=true values.
684static void 769static void
685encode_rv (enc_t *enc, SV *sv) 770encode_rv (enc_t *enc, SV *sv)
686{ 771{
687 svtype svt; 772 svtype svt;
773 GV *method;
688 774
689 SvGETMAGIC (sv); 775 SvGETMAGIC (sv);
690 svt = SvTYPE (sv); 776 svt = SvTYPE (sv);
691 777
692 if (expect_false (SvOBJECT (sv))) 778 if (expect_false (SvOBJECT (sv)))
693 { 779 {
694 HV *boolean_stash = !JSON_SLOW || types_boolean_stash
695 ? types_boolean_stash
696 : gv_stashpv ("Types::Serialiser::Boolean", 1);
697 HV *stash = SvSTASH (sv); 780 HV *stash = SvSTASH (sv);
698 781
699 if (stash == boolean_stash) 782 if (stash == bool_stash)
700 { 783 {
701 if (SvIV (sv))
702 encode_str (enc, "true", 4, 0); 784 if (SvIV (sv)) encode_str (enc, "true" , 4, 0);
703 else
704 encode_str (enc, "false", 5, 0); 785 else encode_str (enc, "false", 5, 0);
705 } 786 }
706 else if (enc->json.flags & F_CONV_BLESSED) 787 else if ((enc->json.flags & F_ALLOW_TAGS) && (method = gv_fetchmethod_autoload (stash, "FREEZE", 0)))
707 { 788 {
708 GV *to_json = gv_fetchmethod_autoload (stash, "TO_JSON", 0); 789 int count;
790 dSP;
709 791
792 ENTER; SAVETMPS;
793 SAVESTACK_POS ();
794 PUSHMARK (SP);
795 EXTEND (SP, 2);
796 // we re-bless the reference to get overload and other niceties right
797 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
710 if (to_json) 798 PUSHs (sv_json);
799
800 PUTBACK;
801 count = call_sv ((SV *)GvCV (method), G_ARRAY);
802 SPAGAIN;
803
804 // catch this surprisingly common error
805 if (SvROK (TOPs) && SvRV (TOPs) == sv)
806 croak ("%s::FREEZE method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
807
808 encode_ch (enc, '(');
809 encode_ch (enc, '"');
810 encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
811 encode_ch (enc, '"');
812 encode_ch (enc, ')');
813 encode_ch (enc, '[');
814
815 while (count)
711 { 816 {
712 dSP; 817 encode_sv (enc, SP[1 - count--]);
713 818
714 ENTER; SAVETMPS; PUSHMARK (SP); 819 if (count)
715 // we re-bless the reference to get overload and other niceties right
716 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
717
718 // calling with G_SCALAR ensures that we always get a 1 return value
719 PUTBACK;
720 call_sv ((SV *)GvCV (to_json), G_SCALAR);
721 SPAGAIN;
722
723 // catch this surprisingly common error
724 if (SvROK (TOPs) && SvRV (TOPs) == sv)
725 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
726
727 sv = POPs;
728 PUTBACK;
729
730 encode_sv (enc, sv); 820 encode_ch (enc, ',');
731
732 FREETMPS; LEAVE;
733 } 821 }
734 else if (enc->json.flags & F_ALLOW_BLESSED) 822
735 encode_str (enc, "null", 4, 0); 823 encode_ch (enc, ']');
736 else 824
737 croak ("encountered object '%s' when conv_object is enabled, but TO_JSON is missing and allow_blessed disabled", 825 FREETMPS; LEAVE;
738 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
739 } 826 }
740 else if (enc->json.flags & F_ALLOW_TAGS) 827 else if ((enc->json.flags & F_CONV_BLESSED) && (method = gv_fetchmethod_autoload (stash, "TO_JSON", 0)))
741 { 828 {
742 GV *method = gv_fetchmethod_autoload (stash, "FREEZE", 0);
743
744 if (method)
745 {
746 int count;
747 dSP; 829 dSP;
748 830
749 ENTER; SAVETMPS; PUSHMARK (SP); 831 ENTER; SAVETMPS;
750 EXTEND (SP, 2); 832 PUSHMARK (SP);
751 // 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
752 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 834 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
753 PUSHs (sv_json);
754 835
836 // calling with G_SCALAR ensures that we always get a 1 return value
755 PUTBACK; 837 PUTBACK;
756 count = call_sv ((SV *)GvCV (method), G_ARRAY); 838 call_sv ((SV *)GvCV (method), G_SCALAR);
757 SPAGAIN; 839 SPAGAIN;
758 840
759 // catch this surprisingly common error 841 // catch this surprisingly common error
760 if (SvROK (TOPs) && SvRV (TOPs) == sv) 842 if (SvROK (TOPs) && SvRV (TOPs) == sv)
761 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv))); 843 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
762 844
763 encode_ch (enc, '('); 845 sv = POPs;
764 encode_ch (enc, '"');
765 encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
766 encode_ch (enc, '"');
767 encode_ch (enc, ')');
768 encode_ch (enc, '[');
769
770 while (count)
771 {
772 encode_sv (enc, SP[1 - count--]);
773
774 if (count)
775 encode_ch (enc, ',');
776 }
777
778 encode_ch (enc, ']');
779
780 PUTBACK; 846 PUTBACK;
781 847
848 encode_sv (enc, sv);
849
782 FREETMPS; LEAVE; 850 FREETMPS; LEAVE;
783 }
784 else if (enc->json.flags & F_ALLOW_BLESSED)
785 encode_str (enc, "null", 4, 0);
786 else
787 croak ("encountered object '%s' when allow_tags is enabled, but FREEZE is missing and allow_blessed disabled",
788 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
789 } 851 }
790 else if (enc->json.flags & F_ALLOW_BLESSED) 852 else if (enc->json.flags & F_ALLOW_BLESSED)
791 encode_str (enc, "null", 4, 0); 853 encode_str (enc, "null", 4, 0);
792 else 854 else
793 croak ("encountered object '%s', but neither allow_blessed, convert_blessed nor allow_tags settings are enabled", 855 croak ("encountered object '%s', but neither allow_blessed, convert_blessed nor allow_tags settings are enabled (or TO_JSON/FREEZE method missing)",
794 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 856 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
795 } 857 }
796 else if (svt == SVt_PVHV) 858 else if (svt == SVt_PVHV)
797 encode_hv (enc, (HV *)sv); 859 encode_hv (enc, (HV *)sv);
798 else if (svt == SVt_PVAV) 860 else if (svt == SVt_PVAV)
799 encode_av (enc, (AV *)sv); 861 encode_av (enc, (AV *)sv);
800 else if (svt < SVt_PVAV) 862 else if (svt < SVt_PVAV)
801 { 863 {
802 STRLEN len = 0; 864 int bool_type = ref_bool_type (sv);
803 char *pv = svt ? SvPV (sv, len) : 0;
804 865
805 if (len == 1 && *pv == '1') 866 if (bool_type == 1)
806 encode_str (enc, "true", 4, 0); 867 encode_str (enc, "true", 4, 0);
807 else if (len == 1 && *pv == '0') 868 else if (bool_type == 0)
808 encode_str (enc, "false", 5, 0); 869 encode_str (enc, "false", 5, 0);
809 else if (enc->json.flags & F_ALLOW_UNKNOWN) 870 else if (enc->json.flags & F_ALLOW_UNKNOWN)
810 encode_str (enc, "null", 4, 0); 871 encode_str (enc, "null", 4, 0);
811 else 872 else
812 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",
… …
895static SV * 956static SV *
896encode_json (SV *scalar, JSON *json) 957encode_json (SV *scalar, JSON *json)
897{ 958{
898 enc_t enc; 959 enc_t enc;
899 960
900 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar)) 961 if (!(json->flags & F_ALLOW_NONREF) && json_nonref (scalar))
901 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)");
902 963
903 enc.json = *json; 964 enc.json = *json;
904 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 965 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
905 enc.cur = SvPVX (enc.sv); 966 enc.cur = SvPVX (enc.sv);
… …
1112 *cur++ = *dec_cur++; 1173 *cur++ = *dec_cur++;
1113 while (--clen); 1174 while (--clen);
1114 1175
1115 utf8 = 1; 1176 utf8 = 1;
1116 } 1177 }
1178 else if (ch == '\t' && dec->json.flags & F_RELAXED)
1179 *cur++ = ch;
1117 else 1180 else
1118 { 1181 {
1119 --dec_cur; 1182 --dec_cur;
1120 1183
1121 if (!ch) 1184 if (!ch)
… …
1131 1194
1132 if (sv) 1195 if (sv)
1133 { 1196 {
1134 STRLEN cur = SvCUR (sv); 1197 STRLEN cur = SvCUR (sv);
1135 1198
1136 if (SvLEN (sv) <= cur + len) 1199 if (SvLEN (sv) - cur <= len)
1137 SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 1200 json_sv_grow (sv, cur, len);
1138 1201
1139 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 1202 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
1140 SvCUR_set (sv, SvCUR (sv) + len); 1203 SvCUR_set (sv, SvCUR (sv) + len);
1141 } 1204 }
1142 else 1205 else
… …
1443 1506
1444 hv_iterinit (hv); 1507 hv_iterinit (hv);
1445 he = hv_iternext (hv); 1508 he = hv_iternext (hv);
1446 hv_iterinit (hv); 1509 hv_iterinit (hv);
1447 1510
1448 // the next line creates a mortal sv each time its called. 1511 // the next line creates a mortal sv each time it's called.
1449 // might want to optimise this for common cases. 1512 // might want to optimise this for common cases.
1450 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);
1451 1514
1452 if (cb) 1515 if (cb)
1453 { 1516 {
1454 dSP; 1517 dSP;
1455 int count; 1518 int count;
1456 1519
1457 ENTER; SAVETMPS; PUSHMARK (SP); 1520 ENTER; SAVETMPS;
1521 SAVESTACK_POS ();
1522 PUSHMARK (SP);
1458 XPUSHs (HeVAL (he)); 1523 XPUSHs (HeVAL (he));
1459 sv_2mortal (sv); 1524 sv_2mortal (sv);
1460 1525
1461 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1526 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1462 1527
… …
1475 if (dec->json.cb_object) 1540 if (dec->json.cb_object)
1476 { 1541 {
1477 dSP; 1542 dSP;
1478 int count; 1543 int count;
1479 1544
1480 ENTER; SAVETMPS; PUSHMARK (SP); 1545 ENTER; SAVETMPS;
1546 SAVESTACK_POS ();
1547 PUSHMARK (SP);
1481 XPUSHs (sv_2mortal (sv)); 1548 XPUSHs (sv_2mortal (sv));
1482 1549
1483 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN; 1550 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1484 1551
1485 if (count == 1) 1552 if (count == 1)
… …
1511 if (!(dec->json.flags & F_ALLOW_TAGS)) 1578 if (!(dec->json.flags & F_ALLOW_TAGS))
1512 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1579 ERR ("malformed JSON string, neither array, object, number, string or atom");
1513 1580
1514 ++dec->cur; 1581 ++dec->cur;
1515 1582
1583 decode_ws (dec);
1584
1516 tag = decode_sv (dec); 1585 tag = decode_sv (dec);
1517 if (!tag) 1586 if (!tag)
1518 goto fail; 1587 goto fail;
1519 1588
1520 if (!SvPOK (tag)) 1589 if (!SvPOK (tag))
1521 ERR ("malformed JSON string, (tag) must be a string"); 1590 ERR ("malformed JSON string, (tag) must be a string");
1522 1591
1592 decode_ws (dec);
1593
1523 if (*dec->cur != ')') 1594 if (*dec->cur != ')')
1524 ERR (") expected after tag"); 1595 ERR (") expected after tag");
1525 1596
1526 ++dec->cur; 1597 ++dec->cur;
1598
1599 decode_ws (dec);
1527 1600
1528 val = decode_sv (dec); 1601 val = decode_sv (dec);
1529 if (!val) 1602 if (!val)
1530 goto fail; 1603 goto fail;
1531 1604
… …
1546 if (!method) 1619 if (!method)
1547 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)");
1548 1621
1549 dSP; 1622 dSP;
1550 1623
1551 ENTER; SAVETMPS; PUSHMARK (SP); 1624 ENTER; SAVETMPS;
1625 PUSHMARK (SP);
1552 EXTEND (SP, len + 2); 1626 EXTEND (SP, len + 2);
1553 // 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
1554 PUSHs (tag); 1628 PUSHs (tag);
1555 PUSHs (sv_json); 1629 PUSHs (sv_json);
1556 1630
… …
1593 case '-': 1667 case '-':
1594 case '0': case '1': case '2': case '3': case '4': 1668 case '0': case '1': case '2': case '3': case '4':
1595 case '5': case '6': case '7': case '8': case '9': 1669 case '5': case '6': case '7': case '8': case '9':
1596 return decode_num (dec); 1670 return decode_num (dec);
1597 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
1598 case 't': 1687 case 't':
1599 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1688 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1600 { 1689 {
1601 dec->cur += 4; 1690 dec->cur += 4;
1602#if JSON_SLOW 1691
1603 types_true = get_bool ("Types::Serialiser::true"); 1692 if (expect_false (!dec->json.v_true))
1604#endif 1693 dec->json.v_true = GET_BOOL (true);
1694
1605 return newSVsv (types_true); 1695 return newSVsv (dec->json.v_true);
1606 } 1696 }
1607 else 1697 else
1608 ERR ("'true' expected"); 1698 ERR ("'true' expected");
1609
1610 break;
1611
1612 case 'f':
1613 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1614 {
1615 dec->cur += 5;
1616#if JSON_SLOW
1617 types_false = get_bool ("Types::Serialiser::false");
1618#endif
1619 return newSVsv (types_false);
1620 }
1621 else
1622 ERR ("'false' expected");
1623 1699
1624 break; 1700 break;
1625 1701
1626 case 'n': 1702 case 'n':
1627 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4)) 1703 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4))
… …
1642fail: 1718fail:
1643 return 0; 1719 return 0;
1644} 1720}
1645 1721
1646static SV * 1722static SV *
1647decode_json (SV *string, JSON *json, char **offset_return) 1723decode_json (SV *string, JSON *json, STRLEN *offset_return)
1648{ 1724{
1649 dec_t dec; 1725 dec_t dec;
1650 SV *sv; 1726 SV *sv;
1651 1727
1652 /* work around bugs in 5.10 where manipulating magic values 1728 /* work around bugs in 5.10 where manipulating magic values
1653 * makes perl ignore the magic in subsequent accesses. 1729 * makes perl ignore the magic in subsequent accesses.
1654 * 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
1655 * 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.
1656 */ 1735 */
1657 /*SvGETMAGIC (string);*/ 1736 /*SvGETMAGIC (string);*/
1658 if (SvMAGICAL (string) || !SvPOK (string)) 1737 if (SvMAGICAL (string) || !SvPOK (string) || SvIsCOW_shared_hash (string))
1659 string = sv_2mortal (newSVsv (string)); 1738 string = sv_2mortal (newSVsv (string));
1660 1739
1661 SvUPGRADE (string, SVt_PV); 1740 SvUPGRADE (string, SVt_PV);
1662 1741
1663 /* 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
… …
1702 1781
1703 decode_ws (&dec); 1782 decode_ws (&dec);
1704 sv = decode_sv (&dec); 1783 sv = decode_sv (&dec);
1705 1784
1706 if (offset_return) 1785 if (offset_return)
1707 *offset_return = dec.cur; 1786 *offset_return = dec.cur - SvPVX (string);
1708 1787 else if (sv)
1709 if (!(offset_return || !sv))
1710 { 1788 {
1711 // check for trailing garbage 1789 // check for trailing garbage
1712 decode_ws (&dec); 1790 decode_ws (&dec);
1713 1791
1714 if (*dec.cur) 1792 if (*dec.cur)
… …
1738 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1816 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1739 } 1817 }
1740 1818
1741 sv = sv_2mortal (sv); 1819 sv = sv_2mortal (sv);
1742 1820
1743 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1821 if (!(dec.json.flags & F_ALLOW_NONREF) && json_nonref (sv))
1744 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)");
1745 1823
1746 return sv; 1824 return sv;
1747} 1825}
1748 1826
… …
1918 i >= '0' && i <= '9' ? i - '0' 1996 i >= '0' && i <= '9' ? i - '0'
1919 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1997 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1920 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1998 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1921 : -1; 1999 : -1;
1922 2000
1923 json_stash = gv_stashpv ("JSON::XS" , 1); 2001 json_stash = gv_stashpv ("JSON::XS" , 1);
1924 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1); 2002 bool_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1925
1926 types_true = get_bool ("Types::Serialiser::true");
1927 types_false = get_bool ("Types::Serialiser::false"); 2003 bool_false = get_bool ("Types::Serialiser::false");
2004 bool_true = get_bool ("Types::Serialiser::true");
1928 2005
1929 sv_json = newSVpv ("JSON", 0); 2006 sv_json = newSVpv ("JSON", 0);
1930 SvREADONLY_on (sv_json); 2007 SvREADONLY_on (sv_json);
1931 2008
1932 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 */
… …
1934 2011
1935PROTOTYPES: DISABLE 2012PROTOTYPES: DISABLE
1936 2013
1937void CLONE (...) 2014void CLONE (...)
1938 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.
1939 json_stash = 0; 2019 json_stash = 0;
1940 types_boolean_stash = 0; 2020 bool_stash = 0;
2021 bool_false = 0;
2022 bool_true = 0;
1941 2023
1942void new (char *klass) 2024void new (char *klass)
1943 PPCODE: 2025 PPCODE:
1944{ 2026{
1945 SV *pv = NEWSV (0, sizeof (JSON)); 2027 SV *pv = NEWSV (0, sizeof (JSON));
… …
1948 XPUSHs (sv_2mortal (sv_bless ( 2030 XPUSHs (sv_2mortal (sv_bless (
1949 newRV_noinc (pv), 2031 newRV_noinc (pv),
1950 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 2032 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1951 ))); 2033 )));
1952} 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 }
1953 2050
1954void ascii (JSON *self, int enable = 1) 2051void ascii (JSON *self, int enable = 1)
1955 ALIAS: 2052 ALIAS:
1956 ascii = F_ASCII 2053 ascii = F_ASCII
1957 latin1 = F_LATIN1 2054 latin1 = F_LATIN1
… …
2062 2159
2063void decode_prefix (JSON *self, SV *jsonstr) 2160void decode_prefix (JSON *self, SV *jsonstr)
2064 PPCODE: 2161 PPCODE:
2065{ 2162{
2066 SV *sv; 2163 SV *sv;
2067 char *offset; 2164 STRLEN offset;
2068 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN; 2165 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
2069 EXTEND (SP, 2); 2166 EXTEND (SP, 2);
2070 PUSHs (sv); 2167 PUSHs (sv);
2071 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset)))); 2168 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, SvPV_nolen (jsonstr) + offset))));
2072} 2169}
2073 2170
2074void incr_parse (JSON *self, SV *jsonstr = 0) 2171void incr_parse (JSON *self, SV *jsonstr = 0)
2075 PPCODE: 2172 PPCODE:
2076{ 2173{
… …
2110 { 2207 {
2111 STRLEN len; 2208 STRLEN len;
2112 const char *str = SvPV (jsonstr, len); 2209 const char *str = SvPV (jsonstr, len);
2113 STRLEN cur = SvCUR (self->incr_text); 2210 STRLEN cur = SvCUR (self->incr_text);
2114 2211
2115 if (SvLEN (self->incr_text) <= cur + len) 2212 if (SvLEN (self->incr_text) - cur <= len)
2116 SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 2213 json_sv_grow (self->incr_text, cur, len);
2117 2214
2118 Move (str, SvEND (self->incr_text), len, char); 2215 Move (str, SvEND (self->incr_text), len, char);
2119 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len); 2216 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
2120 *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
2121 } 2218 }
… …
2123 2220
2124 if (GIMME_V != G_VOID) 2221 if (GIMME_V != G_VOID)
2125 do 2222 do
2126 { 2223 {
2127 SV *sv; 2224 SV *sv;
2128 char *offset; 2225 STRLEN offset;
2129 2226
2130 if (!INCR_DONE (self)) 2227 if (!INCR_DONE (self))
2131 { 2228 {
2132 incr_parse (self); 2229 incr_parse (self);
2133 2230
… …
2149 } 2246 }
2150 2247
2151 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN; 2248 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2152 XPUSHs (sv); 2249 XPUSHs (sv);
2153 2250
2154 self->incr_pos -= offset - SvPVX (self->incr_text); 2251 self->incr_pos -= offset;
2155 self->incr_nest = 0; 2252 self->incr_nest = 0;
2156 self->incr_mode = 0; 2253 self->incr_mode = 0;
2157 2254
2158 sv_chop (self->incr_text, offset); 2255 sv_chop (self->incr_text, SvPVX (self->incr_text) + offset);
2159 } 2256 }
2160 while (GIMME_V == G_ARRAY); 2257 while (GIMME_V == G_ARRAY);
2161} 2258}
2162 2259
2163SV *incr_text (JSON *self) 2260SV *incr_text (JSON *self)
… …
2194 self->incr_mode = 0; 2291 self->incr_mode = 0;
2195} 2292}
2196 2293
2197void DESTROY (JSON *self) 2294void DESTROY (JSON *self)
2198 CODE: 2295 CODE:
2296 SvREFCNT_dec (self->v_false);
2297 SvREFCNT_dec (self->v_true);
2199 SvREFCNT_dec (self->cb_sk_object); 2298 SvREFCNT_dec (self->cb_sk_object);
2200 SvREFCNT_dec (self->cb_object); 2299 SvREFCNT_dec (self->cb_object);
2201 SvREFCNT_dec (self->incr_text); 2300 SvREFCNT_dec (self->incr_text);
2202 2301
2203PROTOTYPES: ENABLE 2302PROTOTYPES: ENABLE

Diff Legend

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