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.84 by root, Thu Mar 27 06:37:35 2008 UTC vs.
Revision 1.114 by root, Wed Aug 1 19:04:41 2012 UTC

… …
12#if defined(__BORLANDC__) || defined(_MSC_VER) 12#if defined(__BORLANDC__) || defined(_MSC_VER)
13# define snprintf _snprintf // C compilers have this in stdio.h 13# define snprintf _snprintf // C compilers have this in stdio.h
14#endif 14#endif
15 15
16// some old perls do not have this, try to make it work, no 16// some old perls do not have this, try to make it work, no
17// guarentees, though. if it breaks, you get to keep the pieces. 17// guarantees, though. if it breaks, you get to keep the pieces.
18#ifndef UTF8_MAXBYTES 18#ifndef UTF8_MAXBYTES
19# define UTF8_MAXBYTES 13 19# define UTF8_MAXBYTES 13
20#endif 20#endif
21 21
22// three extra for rounding, sign, and end of string
22#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 2) 23#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3)
23 24
24#define F_ASCII 0x00000001UL 25#define F_ASCII 0x00000001UL
25#define F_LATIN1 0x00000002UL 26#define F_LATIN1 0x00000002UL
26#define F_UTF8 0x00000004UL 27#define F_UTF8 0x00000004UL
27#define F_INDENT 0x00000008UL 28#define F_INDENT 0x00000008UL
… …
32#define F_SHRINK 0x00000200UL 33#define F_SHRINK 0x00000200UL
33#define F_ALLOW_BLESSED 0x00000400UL 34#define F_ALLOW_BLESSED 0x00000400UL
34#define F_CONV_BLESSED 0x00000800UL 35#define F_CONV_BLESSED 0x00000800UL
35#define F_RELAXED 0x00001000UL 36#define F_RELAXED 0x00001000UL
36#define F_ALLOW_UNKNOWN 0x00002000UL 37#define F_ALLOW_UNKNOWN 0x00002000UL
37
38#define F_MAXDEPTH 0xf8000000UL
39#define S_MAXDEPTH 27
40#define F_MAXSIZE 0x01f00000UL
41#define S_MAXSIZE 20
42#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing 38#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
43 39
44#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
45#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
46
47#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 40#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
48#define F_DEFAULT (9UL << S_MAXDEPTH)
49 41
50#define INIT_SIZE 32 // initial scalar size to be allocated 42#define INIT_SIZE 32 // initial scalar size to be allocated
51#define INDENT_STEP 3 // spaces per indentation level 43#define INDENT_STEP 3 // spaces per indentation level
52 44
53#define SHORT_STRING_LEN 16384 // special-case strings of up to this size 45#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
46
47#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8)
54 48
55#define SB do { 49#define SB do {
56#define SE } while (0) 50#define SE } while (0)
57 51
58#if __GNUC__ >= 3 52#if __GNUC__ >= 3
… …
68 62
69#define IN_RANGE_INC(type,val,beg,end) \ 63#define IN_RANGE_INC(type,val,beg,end) \
70 ((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \ 64 ((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \
71 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg))) 65 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
72 66
67#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"
68
73#ifdef USE_ITHREADS 69#ifdef USE_ITHREADS
74# define JSON_SLOW 1 70# define JSON_SLOW 1
75# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1)) 71# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
76#else 72#else
77# define JSON_SLOW 0 73# define JSON_SLOW 0
… …
83 79
84enum { 80enum {
85 INCR_M_WS = 0, // initial whitespace skipping, must be 0 81 INCR_M_WS = 0, // initial whitespace skipping, must be 0
86 INCR_M_STR, // inside string 82 INCR_M_STR, // inside string
87 INCR_M_BS, // inside backslash 83 INCR_M_BS, // inside backslash
84 INCR_M_C0, // inside comment in initial whitespace sequence
85 INCR_M_C1, // inside comment in other places
88 INCR_M_JSON // outside anything, count nesting 86 INCR_M_JSON // outside anything, count nesting
89}; 87};
90 88
91#define INCR_DONE(json) (!(json)->incr_nest && (json)->incr_mode == INCR_M_JSON) 89#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
92 90
93typedef struct { 91typedef struct {
94 U32 flags; 92 U32 flags;
93 U32 max_depth;
94 STRLEN max_size;
95
95 SV *cb_object; 96 SV *cb_object;
96 HV *cb_sk_object; 97 HV *cb_sk_object;
97 98
98 // for the incremental parser 99 // for the incremental parser
99 SV *incr_text; // the source text so far 100 SV *incr_text; // the source text so far
100 STRLEN incr_pos; // the current offset into the text 101 STRLEN incr_pos; // the current offset into the text
101 int incr_nest; // {[]}-nesting level 102 int incr_nest; // {[]}-nesting level
102 int incr_mode; 103 unsigned char incr_mode;
103} JSON; 104} JSON;
105
106INLINE void
107json_init (JSON *json)
108{
109 Zero (json, 1, JSON);
110 json->max_depth = 512;
111}
104 112
105///////////////////////////////////////////////////////////////////////////// 113/////////////////////////////////////////////////////////////////////////////
106// utility functions 114// utility functions
107 115
108INLINE SV * 116INLINE SV *
… …
118 126
119INLINE void 127INLINE void
120shrink (SV *sv) 128shrink (SV *sv)
121{ 129{
122 sv_utf8_downgrade (sv, 1); 130 sv_utf8_downgrade (sv, 1);
131
123 if (SvLEN (sv) > SvCUR (sv) + 1) 132 if (SvLEN (sv) > SvCUR (sv) + 1)
124 { 133 {
125#ifdef SvPV_shrink_to_cur 134#ifdef SvPV_shrink_to_cur
126 SvPV_shrink_to_cur (sv); 135 SvPV_shrink_to_cur (sv);
127#elif defined (SvPV_renew) 136#elif defined (SvPV_renew)
… …
171 *s++ = 0x80 | ( ch & 0x3f); 180 *s++ = 0x80 | ( ch & 0x3f);
172 181
173 return s; 182 return s;
174} 183}
175 184
185// convert offset pointer to character index, sv must be string
186static STRLEN
187ptr_to_index (SV *sv, char *offset)
188{
189 return SvUTF8 (sv)
190 ? utf8_distance (offset, SvPVX (sv))
191 : offset - SvPVX (sv);
192}
193
194/////////////////////////////////////////////////////////////////////////////
195// fp hell
196
197// scan a group of digits, and a trailing exponent
198static void
199json_atof_scan1 (const char *s, NV *accum, int *expo, int postdp, int maxdepth)
200{
201 UV uaccum = 0;
202 int eaccum = 0;
203
204 // if we recurse too deep, skip all remaining digits
205 // to avoid a stack overflow attack
206 if (expect_false (--maxdepth <= 0))
207 while (((U8)*s - '0') < 10)
208 ++s;
209
210 for (;;)
211 {
212 U8 dig = (U8)*s - '0';
213
214 if (expect_false (dig >= 10))
215 {
216 if (dig == (U8)((U8)'.' - (U8)'0'))
217 {
218 ++s;
219 json_atof_scan1 (s, accum, expo, 1, maxdepth);
220 }
221 else if ((dig | ' ') == 'e' - '0')
222 {
223 int exp2 = 0;
224 int neg = 0;
225
226 ++s;
227
228 if (*s == '-')
229 {
230 ++s;
231 neg = 1;
232 }
233 else if (*s == '+')
234 ++s;
235
236 while ((dig = (U8)*s - '0') < 10)
237 exp2 = exp2 * 10 + *s++ - '0';
238
239 *expo += neg ? -exp2 : exp2;
240 }
241
242 break;
243 }
244
245 ++s;
246
247 uaccum = uaccum * 10 + dig;
248 ++eaccum;
249
250 // if we have too many digits, then recurse for more
251 // we actually do this for rather few digits
252 if (uaccum >= (UV_MAX - 9) / 10)
253 {
254 if (postdp) *expo -= eaccum;
255 json_atof_scan1 (s, accum, expo, postdp, maxdepth);
256 if (postdp) *expo += eaccum;
257
258 break;
259 }
260 }
261
262 // this relies greatly on the quality of the pow ()
263 // implementation of the platform, but a good
264 // implementation is hard to beat.
265 // (IEEE 754 conformant ones are required to be exact)
266 if (postdp) *expo -= eaccum;
267 *accum += uaccum * Perl_pow (10., *expo);
268 *expo += eaccum;
269}
270
271static NV
272json_atof (const char *s)
273{
274 NV accum = 0.;
275 int expo = 0;
276 int neg = 0;
277
278 if (*s == '-')
279 {
280 ++s;
281 neg = 1;
282 }
283
284 // a recursion depth of ten gives us >>500 bits
285 json_atof_scan1 (s, &accum, &expo, 0, 10);
286
287 return neg ? -accum : accum;
288}
176///////////////////////////////////////////////////////////////////////////// 289/////////////////////////////////////////////////////////////////////////////
177// encoder 290// encoder
178 291
179// structure used for encoding JSON 292// structure used for encoding JSON
180typedef struct 293typedef struct
… …
182 char *cur; // SvPVX (sv) + current output position 295 char *cur; // SvPVX (sv) + current output position
183 char *end; // SvEND (sv) 296 char *end; // SvEND (sv)
184 SV *sv; // result scalar 297 SV *sv; // result scalar
185 JSON json; 298 JSON json;
186 U32 indent; // indentation level 299 U32 indent; // indentation level
187 U32 maxdepth; // max. indentation/recursion level
188 UV limit; // escape character values >= this value when encoding 300 UV limit; // escape character values >= this value when encoding
189} enc_t; 301} enc_t;
190 302
191INLINE void 303INLINE void
192need (enc_t *enc, STRLEN len) 304need (enc_t *enc, STRLEN len)
193{ 305{
194 if (expect_false (enc->cur + len >= enc->end)) 306 if (expect_false (enc->cur + len >= enc->end))
195 { 307 {
196 STRLEN cur = enc->cur - SvPVX (enc->sv); 308 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
197 SvGROW (enc->sv, cur + len + 1); 309 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
198 enc->cur = SvPVX (enc->sv) + cur; 310 enc->cur = SvPVX (enc->sv) + cur;
199 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 311 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
200 } 312 }
201} 313}
202 314
… …
277 (int)((uch - 0x10000) % 0x400 + 0xDC00)); 389 (int)((uch - 0x10000) % 0x400 + 0xDC00));
278 enc->cur += 12; 390 enc->cur += 12;
279 } 391 }
280 else 392 else
281 { 393 {
282 static char hexdigit [16] = "0123456789abcdef";
283 need (enc, len += 5); 394 need (enc, len += 5);
284 *enc->cur++ = '\\'; 395 *enc->cur++ = '\\';
285 *enc->cur++ = 'u'; 396 *enc->cur++ = 'u';
286 *enc->cur++ = hexdigit [ uch >> 12 ]; 397 *enc->cur++ = PL_hexdigit [ uch >> 12 ];
287 *enc->cur++ = hexdigit [(uch >> 8) & 15]; 398 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
288 *enc->cur++ = hexdigit [(uch >> 4) & 15]; 399 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
289 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 400 *enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
290 } 401 }
291 402
292 str += clen; 403 str += clen;
293 } 404 }
294 else if (enc->json.flags & F_LATIN1) 405 else if (enc->json.flags & F_LATIN1)
… …
365static void 476static void
366encode_av (enc_t *enc, AV *av) 477encode_av (enc_t *enc, AV *av)
367{ 478{
368 int i, len = av_len (av); 479 int i, len = av_len (av);
369 480
370 if (enc->indent >= enc->maxdepth) 481 if (enc->indent >= enc->json.max_depth)
371 croak ("data structure too deep (hit recursion limit)"); 482 croak (ERR_NESTING_EXCEEDED);
372 483
373 encode_ch (enc, '['); 484 encode_ch (enc, '[');
374 485
375 if (len >= 0) 486 if (len >= 0)
376 { 487 {
… …
451static void 562static void
452encode_hv (enc_t *enc, HV *hv) 563encode_hv (enc_t *enc, HV *hv)
453{ 564{
454 HE *he; 565 HE *he;
455 566
456 if (enc->indent >= enc->maxdepth) 567 if (enc->indent >= enc->json.max_depth)
457 croak ("data structure too deep (hit recursion limit)"); 568 croak (ERR_NESTING_EXCEEDED);
458 569
459 encode_ch (enc, '{'); 570 encode_ch (enc, '{');
460 571
461 // for canonical output we have to sort by keys first 572 // for canonical output we have to sort by keys first
462 // actually, this is mostly due to the stupid so-called 573 // actually, this is mostly due to the stupid so-called
463 // security workaround added somewhere in 5.8.x. 574 // security workaround added somewhere in 5.8.x
464 // that randomises hash orderings 575 // that randomises hash orderings
465 if (enc->json.flags & F_CANONICAL) 576 if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
466 { 577 {
467 int count = hv_iterinit (hv); 578 int count = hv_iterinit (hv);
468 579
469 if (SvMAGICAL (hv)) 580 if (SvMAGICAL (hv))
470 { 581 {
… …
714 } 825 }
715 else 826 else
716 { 827 {
717 // large integer, use the (rather slow) snprintf way. 828 // large integer, use the (rather slow) snprintf way.
718 need (enc, IVUV_MAXCHARS); 829 need (enc, IVUV_MAXCHARS);
719 enc->cur += 830 enc->cur +=
720 SvIsUV(sv) 831 SvIsUV(sv)
721 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv)) 832 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
722 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv)); 833 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
723 } 834 }
724 } 835 }
… …
726 encode_rv (enc, SvRV (sv)); 837 encode_rv (enc, SvRV (sv));
727 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN) 838 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
728 encode_str (enc, "null", 4, 0); 839 encode_str (enc, "null", 4, 0);
729 else 840 else
730 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 841 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
731 SvPV_nolen (sv), SvFLAGS (sv)); 842 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
732} 843}
733 844
734static SV * 845static SV *
735encode_json (SV *scalar, JSON *json) 846encode_json (SV *scalar, JSON *json)
736{ 847{
… …
742 enc.json = *json; 853 enc.json = *json;
743 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 854 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
744 enc.cur = SvPVX (enc.sv); 855 enc.cur = SvPVX (enc.sv);
745 enc.end = SvEND (enc.sv); 856 enc.end = SvEND (enc.sv);
746 enc.indent = 0; 857 enc.indent = 0;
747 enc.maxdepth = DEC_DEPTH (enc.json.flags);
748 enc.limit = enc.json.flags & F_ASCII ? 0x000080UL 858 enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
749 : enc.json.flags & F_LATIN1 ? 0x000100UL 859 : enc.json.flags & F_LATIN1 ? 0x000100UL
750 : 0x110000UL; 860 : 0x110000UL;
751 861
752 SvPOK_only (enc.sv); 862 SvPOK_only (enc.sv);
753 encode_sv (&enc, scalar); 863 encode_sv (&enc, scalar);
864 encode_nl (&enc);
754 865
755 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 866 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
756 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 867 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
757 868
758 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8))) 869 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
… …
819 if (*dec->cur != ch) \ 930 if (*dec->cur != ch) \
820 ERR (# ch " expected"); \ 931 ERR (# ch " expected"); \
821 ++dec->cur; \ 932 ++dec->cur; \
822 SE 933 SE
823 934
824#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)") 935#define DEC_INC_DEPTH if (++dec->depth > dec->json.max_depth) ERR (ERR_NESTING_EXCEEDED)
825#define DEC_DEC_DEPTH --dec->depth 936#define DEC_DEC_DEPTH --dec->depth
826 937
827static SV *decode_sv (dec_t *dec); 938static SV *decode_sv (dec_t *dec);
828 939
829static signed char decode_hexdigit[256]; 940static signed char decode_hexdigit[256];
… …
938 else if (expect_true (ch >= 0x20 && ch < 0x80)) 1049 else if (expect_true (ch >= 0x20 && ch < 0x80))
939 *cur++ = ch; 1050 *cur++ = ch;
940 else if (ch >= 0x80) 1051 else if (ch >= 0x80)
941 { 1052 {
942 STRLEN clen; 1053 STRLEN clen;
943 UV uch;
944 1054
945 --dec_cur; 1055 --dec_cur;
946 1056
947 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen); 1057 decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
948 if (clen == (STRLEN)-1) 1058 if (clen == (STRLEN)-1)
949 ERR ("malformed UTF-8 character in JSON string"); 1059 ERR ("malformed UTF-8 character in JSON string");
950 1060
951 do 1061 do
952 *cur++ = *dec_cur++; 1062 *cur++ = *dec_cur++;
… …
969 { 1079 {
970 STRLEN len = cur - buf; 1080 STRLEN len = cur - buf;
971 1081
972 if (sv) 1082 if (sv)
973 { 1083 {
974 SvGROW (sv, SvCUR (sv) + len + 1); 1084 STRLEN cur = SvCUR (sv);
1085
1086 if (SvLEN (sv) <= cur + len)
1087 SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
1088
975 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 1089 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
976 SvCUR_set (sv, SvCUR (sv) + len); 1090 SvCUR_set (sv, SvCUR (sv) + len);
977 } 1091 }
978 else 1092 else
979 sv = newSVpvn (buf, len); 1093 sv = newSVpvn (buf, len);
… …
1070 1184
1071 // special case the rather common 1..5-digit-int case 1185 // special case the rather common 1..5-digit-int case
1072 if (*start == '-') 1186 if (*start == '-')
1073 switch (len) 1187 switch (len)
1074 { 1188 {
1075 case 2: return newSViv (-( start [1] - '0' * 1)); 1189 case 2: return newSViv (-(IV)( start [1] - '0' * 1));
1076 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11)); 1190 case 3: return newSViv (-(IV)( start [1] * 10 + start [2] - '0' * 11));
1077 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111)); 1191 case 4: return newSViv (-(IV)( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
1078 case 5: return newSViv (-( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111)); 1192 case 5: return newSViv (-(IV)( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
1079 case 6: return newSViv (-(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111)); 1193 case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
1080 } 1194 }
1081 else 1195 else
1082 switch (len) 1196 switch (len)
1083 { 1197 {
1084 case 1: return newSViv ( start [0] - '0' * 1); 1198 case 1: return newSViv ( start [0] - '0' * 1);
1085 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11); 1199 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
1086 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111); 1200 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
1087 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111); 1201 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
1088 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111); 1202 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
1089 } 1203 }
1090 1204
1091 { 1205 {
1092 UV uv; 1206 UV uv;
1093 int numtype = grok_number (start, len, &uv); 1207 int numtype = grok_number (start, len, &uv);
… …
1102 } 1216 }
1103 1217
1104 len -= *start == '-' ? 1 : 0; 1218 len -= *start == '-' ? 1 : 0;
1105 1219
1106 // does not fit into IV or UV, try NV 1220 // does not fit into IV or UV, try NV
1107 if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len) 1221 if (len <= NV_DIG)
1108 #if defined (LDBL_DIG)
1109 || (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
1110 #endif
1111 )
1112 // fits into NV without loss of precision 1222 // fits into NV without loss of precision
1113 return newSVnv (Atof (start)); 1223 return newSVnv (json_atof (start));
1114 1224
1115 // everything else fails, convert it to a string 1225 // everything else fails, convert it to a string
1116 return newSVpvn (start, dec->cur - start); 1226 return newSVpvn (start, dec->cur - start);
1117 } 1227 }
1118 1228
1119 // loss of precision here 1229 // loss of precision here
1120 return newSVnv (Atof (start)); 1230 return newSVnv (json_atof (start));
1121 1231
1122fail: 1232fail:
1123 return 0; 1233 return 0;
1124} 1234}
1125 1235
… …
1294 dSP; 1404 dSP;
1295 int count; 1405 int count;
1296 1406
1297 ENTER; SAVETMPS; PUSHMARK (SP); 1407 ENTER; SAVETMPS; PUSHMARK (SP);
1298 XPUSHs (HeVAL (he)); 1408 XPUSHs (HeVAL (he));
1409 sv_2mortal (sv);
1299 1410
1300 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1411 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1301 1412
1302 if (count == 1) 1413 if (count == 1)
1303 { 1414 {
1304 sv = newSVsv (POPs); 1415 sv = newSVsv (POPs);
1305 FREETMPS; LEAVE; 1416 FREETMPS; LEAVE;
1306 return sv; 1417 return sv;
1307 } 1418 }
1308 1419
1420 SvREFCNT_inc (sv);
1309 FREETMPS; LEAVE; 1421 FREETMPS; LEAVE;
1310 } 1422 }
1311 } 1423 }
1312 1424
1313 if (dec->json.cb_object) 1425 if (dec->json.cb_object)
… …
1403fail: 1515fail:
1404 return 0; 1516 return 0;
1405} 1517}
1406 1518
1407static SV * 1519static SV *
1408decode_json (SV *string, JSON *json, STRLEN *offset_return) 1520decode_json (SV *string, JSON *json, char **offset_return)
1409{ 1521{
1410 dec_t dec; 1522 dec_t dec;
1411 STRLEN offset;
1412 SV *sv; 1523 SV *sv;
1413 1524
1525 /* work around bugs in 5.10 where manipulating magic values
1526 * will perl ignore the magic in subsequent accesses.
1527 * also make a copy of non-PV values, to get them into a clean
1528 * state (SvPV should do that, but it's buggy, see below).
1529 */
1414 SvGETMAGIC (string); 1530 /*SvGETMAGIC (string);*/
1531 if (SvMAGICAL (string) || !SvPOK (string))
1532 string = sv_2mortal (newSVsv (string));
1533
1415 SvUPGRADE (string, SVt_PV); 1534 SvUPGRADE (string, SVt_PV);
1416 1535
1417 if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags)) 1536 /* work around a bug in perl 5.10, which causes SvCUR to fail an
1537 * assertion with -DDEBUGGING, although SvCUR is documented to
1538 * return the xpv_cur field which certainly exists after upgrading.
1539 * according to nicholas clark, calling SvPOK fixes this.
1540 * But it doesn't fix it, so try another workaround, call SvPV_nolen
1541 * and hope for the best.
1542 * Damnit, SvPV_nolen still trips over yet another assertion. This
1543 * assertion business is seriously broken, try yet another workaround
1544 * for the broken -DDEBUGGING.
1545 */
1546 {
1547#ifdef DEBUGGING
1548 STRLEN offset = SvOK (string) ? sv_len (string) : 0;
1549#else
1550 STRLEN offset = SvCUR (string);
1551#endif
1552
1553 if (offset > json->max_size && json->max_size)
1418 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 1554 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1419 (unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags)); 1555 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1556 }
1420 1557
1421 if (json->flags & F_UTF8) 1558 if (DECODE_WANTS_OCTETS (json))
1422 sv_utf8_downgrade (string, 0); 1559 sv_utf8_downgrade (string, 0);
1423 else 1560 else
1424 sv_utf8_upgrade (string); 1561 sv_utf8_upgrade (string);
1425 1562
1426 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1563 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1427 1564
1428 dec.json = *json; 1565 dec.json = *json;
1429 dec.cur = SvPVX (string); 1566 dec.cur = SvPVX (string);
1430 dec.end = SvEND (string); 1567 dec.end = SvEND (string);
1431 dec.err = 0; 1568 dec.err = 0;
1432 dec.depth = 0; 1569 dec.depth = 0;
1433 dec.maxdepth = DEC_DEPTH (dec.json.flags);
1434 1570
1435 if (dec.json.cb_object || dec.json.cb_sk_object) 1571 if (dec.json.cb_object || dec.json.cb_sk_object)
1436 dec.json.flags |= F_HOOK; 1572 dec.json.flags |= F_HOOK;
1437 1573
1438 *dec.end = 0; // this should basically be a nop, too, but make sure it's there 1574 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1439 1575
1440 decode_ws (&dec); 1576 decode_ws (&dec);
1441 sv = decode_sv (&dec); 1577 sv = decode_sv (&dec);
1578
1579 if (offset_return)
1580 *offset_return = dec.cur;
1442 1581
1443 if (!(offset_return || !sv)) 1582 if (!(offset_return || !sv))
1444 { 1583 {
1445 // check for trailing garbage 1584 // check for trailing garbage
1446 decode_ws (&dec); 1585 decode_ws (&dec);
… …
1449 { 1588 {
1450 dec.err = "garbage after JSON object"; 1589 dec.err = "garbage after JSON object";
1451 SvREFCNT_dec (sv); 1590 SvREFCNT_dec (sv);
1452 sv = 0; 1591 sv = 0;
1453 } 1592 }
1454 }
1455
1456 if (offset_return || !sv)
1457 {
1458 offset = dec.json.flags & F_UTF8
1459 ? dec.cur - SvPVX (string)
1460 : utf8_distance (dec.cur, SvPVX (string));
1461
1462 if (offset_return)
1463 *offset_return = offset;
1464 } 1593 }
1465 1594
1466 if (!sv) 1595 if (!sv)
1467 { 1596 {
1468 SV *uni = sv_newmortal (); 1597 SV *uni = sv_newmortal ();
… …
1474 SAVEVPTR (PL_curcop); 1603 SAVEVPTR (PL_curcop);
1475 PL_curcop = &cop; 1604 PL_curcop = &cop;
1476 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1605 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1477 LEAVE; 1606 LEAVE;
1478 1607
1479 croak ("%s, at character offset %d [\"%s\"]", 1608 croak ("%s, at character offset %d (before \"%s\")",
1480 dec.err, 1609 dec.err,
1481 (int)offset, 1610 (int)ptr_to_index (string, dec.cur),
1482 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1611 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1483 } 1612 }
1484 1613
1485 sv = sv_2mortal (sv); 1614 sv = sv_2mortal (sv);
1486 1615
… …
1495 1624
1496static void 1625static void
1497incr_parse (JSON *self) 1626incr_parse (JSON *self)
1498{ 1627{
1499 const char *p = SvPVX (self->incr_text) + self->incr_pos; 1628 const char *p = SvPVX (self->incr_text) + self->incr_pos;
1629
1630 // the state machine here is a bit convoluted and could be simplified a lot
1631 // but this would make it slower, so...
1500 1632
1501 for (;;) 1633 for (;;)
1502 { 1634 {
1503 //printf ("loop pod %d *p<%c><%s>, mode %d nest %d\n", p - SvPVX (self->incr_text), *p, p, self->incr_mode, self->incr_nest);//D 1635 //printf ("loop pod %d *p<%c><%s>, mode %d nest %d\n", p - SvPVX (self->incr_text), *p, p, self->incr_mode, self->incr_nest);//D
1504 switch (self->incr_mode) 1636 switch (self->incr_mode)
1505 { 1637 {
1506 // only used for intiial whitespace skipping 1638 // only used for initial whitespace skipping
1507 case INCR_M_WS: 1639 case INCR_M_WS:
1508 for (;;) 1640 for (;;)
1509 { 1641 {
1510 if (*p > 0x20) 1642 if (*p > 0x20)
1511 { 1643 {
1644 if (*p == '#')
1645 {
1646 self->incr_mode = INCR_M_C0;
1647 goto incr_m_c;
1648 }
1649 else
1650 {
1512 self->incr_mode = INCR_M_JSON; 1651 self->incr_mode = INCR_M_JSON;
1513 goto incr_m_json; 1652 goto incr_m_json;
1653 }
1514 } 1654 }
1515 else if (!*p) 1655 else if (!*p)
1516 goto interrupt; 1656 goto interrupt;
1517 1657
1518 ++p; 1658 ++p;
… …
1524 goto interrupt; 1664 goto interrupt;
1525 1665
1526 ++p; 1666 ++p;
1527 self->incr_mode = INCR_M_STR; 1667 self->incr_mode = INCR_M_STR;
1528 goto incr_m_str; 1668 goto incr_m_str;
1669
1670 // inside #-style comments
1671 case INCR_M_C0:
1672 case INCR_M_C1:
1673 incr_m_c:
1674 for (;;)
1675 {
1676 if (*p == '\n')
1677 {
1678 self->incr_mode = self->incr_mode == INCR_M_C0 ? INCR_M_WS : INCR_M_JSON;
1679 break;
1680 }
1681 else if (!*p)
1682 goto interrupt;
1683
1684 ++p;
1685 }
1686
1687 break;
1529 1688
1530 // inside a string 1689 // inside a string
1531 case INCR_M_STR: 1690 case INCR_M_STR:
1532 incr_m_str: 1691 incr_m_str:
1533 for (;;) 1692 for (;;)
… …
1584 self->incr_mode = INCR_M_STR; 1743 self->incr_mode = INCR_M_STR;
1585 goto incr_m_str; 1744 goto incr_m_str;
1586 1745
1587 case '[': 1746 case '[':
1588 case '{': 1747 case '{':
1589 ++self->incr_nest; 1748 if (++self->incr_nest > self->max_depth)
1749 croak (ERR_NESTING_EXCEEDED);
1590 break; 1750 break;
1591 1751
1592 case ']': 1752 case ']':
1593 case '}': 1753 case '}':
1594 if (!--self->incr_nest) 1754 if (--self->incr_nest <= 0)
1595 goto interrupt; 1755 goto interrupt;
1756 break;
1757
1758 case '#':
1759 self->incr_mode = INCR_M_C1;
1760 goto incr_m_c;
1596 } 1761 }
1597 } 1762 }
1598 } 1763 }
1599 1764
1600 modechange: 1765 modechange:
1601 ; 1766 ;
1602 } 1767 }
1603 1768
1604interrupt: 1769interrupt:
1605 self->incr_pos = p - SvPVX (self->incr_text); 1770 self->incr_pos = p - SvPVX (self->incr_text);
1771 //printf ("interrupt<%.*s>\n", self->incr_pos, SvPVX(self->incr_text));//D
1606 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D 1772 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1607} 1773}
1608 1774
1609///////////////////////////////////////////////////////////////////////////// 1775/////////////////////////////////////////////////////////////////////////////
1610// XS interface functions 1776// XS interface functions
… …
1625 json_stash = gv_stashpv ("JSON::XS" , 1); 1791 json_stash = gv_stashpv ("JSON::XS" , 1);
1626 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1792 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1627 1793
1628 json_true = get_bool ("JSON::XS::true"); 1794 json_true = get_bool ("JSON::XS::true");
1629 json_false = get_bool ("JSON::XS::false"); 1795 json_false = get_bool ("JSON::XS::false");
1796
1797 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1630} 1798}
1631 1799
1632PROTOTYPES: DISABLE 1800PROTOTYPES: DISABLE
1633 1801
1634void CLONE (...) 1802void CLONE (...)
… …
1639void new (char *klass) 1807void new (char *klass)
1640 PPCODE: 1808 PPCODE:
1641{ 1809{
1642 SV *pv = NEWSV (0, sizeof (JSON)); 1810 SV *pv = NEWSV (0, sizeof (JSON));
1643 SvPOK_only (pv); 1811 SvPOK_only (pv);
1644 Zero (SvPVX (pv), 1, JSON); 1812 json_init ((JSON *)SvPVX (pv));
1645 ((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1646 XPUSHs (sv_2mortal (sv_bless ( 1813 XPUSHs (sv_2mortal (sv_bless (
1647 newRV_noinc (pv), 1814 newRV_noinc (pv),
1648 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 1815 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1649 ))); 1816 )));
1650} 1817}
… …
1691 get_relaxed = F_RELAXED 1858 get_relaxed = F_RELAXED
1692 get_allow_unknown = F_ALLOW_UNKNOWN 1859 get_allow_unknown = F_ALLOW_UNKNOWN
1693 PPCODE: 1860 PPCODE:
1694 XPUSHs (boolSV (self->flags & ix)); 1861 XPUSHs (boolSV (self->flags & ix));
1695 1862
1696void max_depth (JSON *self, UV max_depth = 0x80000000UL) 1863void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1697 PPCODE: 1864 PPCODE:
1698{ 1865 self->max_depth = max_depth;
1699 UV log2 = 0;
1700
1701 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1702
1703 while ((1UL << log2) < max_depth)
1704 ++log2;
1705
1706 self->flags = self->flags & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1707
1708 XPUSHs (ST (0)); 1866 XPUSHs (ST (0));
1709}
1710 1867
1711U32 get_max_depth (JSON *self) 1868U32 get_max_depth (JSON *self)
1712 CODE: 1869 CODE:
1713 RETVAL = DEC_DEPTH (self->flags); 1870 RETVAL = self->max_depth;
1714 OUTPUT: 1871 OUTPUT:
1715 RETVAL 1872 RETVAL
1716 1873
1717void max_size (JSON *self, UV max_size = 0) 1874void max_size (JSON *self, U32 max_size = 0)
1718 PPCODE: 1875 PPCODE:
1719{ 1876 self->max_size = max_size;
1720 UV log2 = 0;
1721
1722 if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1723 if (max_size == 1) max_size = 2;
1724
1725 while ((1UL << log2) < max_size)
1726 ++log2;
1727
1728 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1729
1730 XPUSHs (ST (0)); 1877 XPUSHs (ST (0));
1731}
1732 1878
1733int get_max_size (JSON *self) 1879int get_max_size (JSON *self)
1734 CODE: 1880 CODE:
1735 RETVAL = DEC_SIZE (self->flags); 1881 RETVAL = self->max_size;
1736 OUTPUT: 1882 OUTPUT:
1737 RETVAL 1883 RETVAL
1738 1884
1739void filter_json_object (JSON *self, SV *cb = &PL_sv_undef) 1885void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
1740 PPCODE: 1886 PPCODE:
… …
1746} 1892}
1747 1893
1748void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef) 1894void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1749 PPCODE: 1895 PPCODE:
1750{ 1896{
1751 if (!self->cb_sk_object) 1897 if (!self->cb_sk_object)
1752 self->cb_sk_object = newHV (); 1898 self->cb_sk_object = newHV ();
1753 1899
1754 if (SvOK (cb)) 1900 if (SvOK (cb))
1755 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0); 1901 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1756 else 1902 else
… …
1767 XPUSHs (ST (0)); 1913 XPUSHs (ST (0));
1768} 1914}
1769 1915
1770void encode (JSON *self, SV *scalar) 1916void encode (JSON *self, SV *scalar)
1771 PPCODE: 1917 PPCODE:
1772 XPUSHs (encode_json (scalar, self)); 1918 PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
1919 XPUSHs (scalar);
1773 1920
1774void decode (JSON *self, SV *jsonstr) 1921void decode (JSON *self, SV *jsonstr)
1775 PPCODE: 1922 PPCODE:
1776 XPUSHs (decode_json (jsonstr, self, 0)); 1923 PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
1924 XPUSHs (jsonstr);
1777 1925
1778void decode_prefix (JSON *self, SV *jsonstr) 1926void decode_prefix (JSON *self, SV *jsonstr)
1779 PPCODE: 1927 PPCODE:
1780{ 1928{
1781 STRLEN offset; 1929 SV *sv;
1930 char *offset;
1931 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1782 EXTEND (SP, 2); 1932 EXTEND (SP, 2);
1783 PUSHs (decode_json (jsonstr, self, &offset)); 1933 PUSHs (sv);
1784 PUSHs (sv_2mortal (newSVuv (offset))); 1934 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1785} 1935}
1786 1936
1787void incr_parse (JSON *self, SV *jsonstr = 0) 1937void incr_parse (JSON *self, SV *jsonstr = 0)
1788 PPCODE: 1938 PPCODE:
1789{ 1939{
1790 if (!self->incr_text) 1940 if (!self->incr_text)
1791 self->incr_text = newSVpvn ("", 0); 1941 self->incr_text = newSVpvn ("", 0);
1942
1943 /* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
1944 if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
1945 if (DECODE_WANTS_OCTETS (self))
1946 {
1947 if (self->incr_pos)
1948 self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
1949 (U8 *)SvPVX (self->incr_text) + self->incr_pos);
1950
1951 sv_utf8_downgrade (self->incr_text, 0);
1952 }
1953 else
1954 {
1955 sv_utf8_upgrade (self->incr_text);
1956
1957 if (self->incr_pos)
1958 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1959 - (U8 *)SvPVX (self->incr_text);
1960 }
1792 1961
1793 // append data, if any 1962 // append data, if any
1794 if (jsonstr) 1963 if (jsonstr)
1795 { 1964 {
1965 /* make sure both strings have same encoding */
1796 if (SvUTF8 (jsonstr) && !SvUTF8 (self->incr_text)) 1966 if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
1967 if (SvUTF8 (jsonstr))
1968 sv_utf8_downgrade (jsonstr, 0);
1797 { 1969 else
1798 /* utf-8-ness differs, need to upgrade */
1799 sv_utf8_upgrade (self->incr_text); 1970 sv_utf8_upgrade (jsonstr);
1800 1971
1801 if (self->incr_pos) 1972 /* and then just blindly append */
1802 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1803 - (U8 *)SvPVX (self->incr_text);
1804 }
1805
1806 { 1973 {
1807 STRLEN len; 1974 STRLEN len;
1808 const char *str = SvPV (jsonstr, len); 1975 const char *str = SvPV (jsonstr, len);
1809 SvGROW (self->incr_text, SvCUR (self->incr_text) + len + 1); 1976 STRLEN cur = SvCUR (self->incr_text);
1977
1978 if (SvLEN (self->incr_text) <= cur + len)
1979 SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
1980
1810 Move (str, SvEND (self->incr_text), len, char); 1981 Move (str, SvEND (self->incr_text), len, char);
1811 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len); 1982 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
1812 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there 1983 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
1813 } 1984 }
1814 } 1985 }
1815 1986
1816 if (GIMME_V != G_VOID) 1987 if (GIMME_V != G_VOID)
1817 do 1988 do
1818 { 1989 {
1990 SV *sv;
1819 STRLEN offset; 1991 char *offset;
1820 1992
1821 if (!INCR_DONE (self)) 1993 if (!INCR_DONE (self))
1822 { 1994 {
1823 incr_parse (self); 1995 incr_parse (self);
1996
1997 if (self->incr_pos > self->max_size && self->max_size)
1998 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1999 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
2000
1824 if (!INCR_DONE (self)) 2001 if (!INCR_DONE (self))
2002 {
2003 // as an optimisation, do not accumulate white space in the incr buffer
2004 if (self->incr_mode == INCR_M_WS && self->incr_pos)
2005 {
2006 self->incr_pos = 0;
2007 SvCUR_set (self->incr_text, 0);
2008 }
2009
1825 break; 2010 break;
2011 }
1826 } 2012 }
1827 2013
1828 XPUSHs (decode_json (self->incr_text, self, &offset)); 2014 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2015 XPUSHs (sv);
1829 2016
1830 sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + offset);
1831 self->incr_pos -= offset; 2017 self->incr_pos -= offset - SvPVX (self->incr_text);
1832 self->incr_nest = 0; 2018 self->incr_nest = 0;
1833 self->incr_mode = 0; 2019 self->incr_mode = 0;
2020
2021 sv_chop (self->incr_text, offset);
1834 } 2022 }
1835 while (GIMME_V == G_ARRAY); 2023 while (GIMME_V == G_ARRAY);
1836} 2024}
1837 2025
1838SV *incr_text (JSON *self) 2026SV *incr_text (JSON *self)
… …
1857 self->incr_nest = 0; 2045 self->incr_nest = 0;
1858 self->incr_mode = 0; 2046 self->incr_mode = 0;
1859 } 2047 }
1860} 2048}
1861 2049
2050void incr_reset (JSON *self)
2051 CODE:
2052{
2053 SvREFCNT_dec (self->incr_text);
2054 self->incr_text = 0;
2055 self->incr_pos = 0;
2056 self->incr_nest = 0;
2057 self->incr_mode = 0;
2058}
2059
1862void DESTROY (JSON *self) 2060void DESTROY (JSON *self)
1863 CODE: 2061 CODE:
1864 SvREFCNT_dec (self->cb_sk_object); 2062 SvREFCNT_dec (self->cb_sk_object);
1865 SvREFCNT_dec (self->cb_object); 2063 SvREFCNT_dec (self->cb_object);
1866 SvREFCNT_dec (self->incr_text); 2064 SvREFCNT_dec (self->incr_text);
… …
1871 ALIAS: 2069 ALIAS:
1872 to_json_ = 0 2070 to_json_ = 0
1873 encode_json = F_UTF8 2071 encode_json = F_UTF8
1874 PPCODE: 2072 PPCODE:
1875{ 2073{
1876 JSON json = { F_DEFAULT | ix }; 2074 JSON json;
1877 XPUSHs (encode_json (scalar, &json)); 2075 json_init (&json);
2076 json.flags |= ix;
2077 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2078 XPUSHs (scalar);
1878} 2079}
1879 2080
1880void decode_json (SV *jsonstr) 2081void decode_json (SV *jsonstr)
1881 ALIAS: 2082 ALIAS:
1882 from_json_ = 0 2083 from_json_ = 0
1883 decode_json = F_UTF8 2084 decode_json = F_UTF8
1884 PPCODE: 2085 PPCODE:
1885{ 2086{
1886 JSON json = { F_DEFAULT | ix }; 2087 JSON json;
1887 XPUSHs (decode_json (jsonstr, &json, 0)); 2088 json_init (&json);
2089 json.flags |= ix;
2090 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2091 XPUSHs (jsonstr);
1888} 2092}
1889 2093
1890

Diff Legend

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