… | |
… | |
42 | #define INIT_SIZE 32 // initial scalar size to be allocated |
42 | #define INIT_SIZE 32 // initial scalar size to be allocated |
43 | #define INDENT_STEP 3 // spaces per indentation level |
43 | #define INDENT_STEP 3 // spaces per indentation level |
44 | |
44 | |
45 | #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 | |
46 | |
|
|
47 | #define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8) |
|
|
48 | |
47 | #define SB do { |
49 | #define SB do { |
48 | #define SE } while (0) |
50 | #define SE } while (0) |
49 | |
51 | |
50 | #if __GNUC__ >= 3 |
52 | #if __GNUC__ >= 3 |
51 | # define expect(expr,value) __builtin_expect ((expr), (value)) |
53 | # define expect(expr,value) __builtin_expect ((expr), (value)) |
… | |
… | |
192 | ///////////////////////////////////////////////////////////////////////////// |
194 | ///////////////////////////////////////////////////////////////////////////// |
193 | // fp hell |
195 | // fp hell |
194 | |
196 | |
195 | // scan a group of digits, and a trailing exponent |
197 | // scan a group of digits, and a trailing exponent |
196 | static void |
198 | static void |
197 | json_atof_scan1 (const char *s, NV *accum, int *expo, int postdp) |
199 | json_atof_scan1 (const char *s, NV *accum, int *expo, int postdp, int maxdepth) |
198 | { |
200 | { |
199 | UV uaccum = 0; |
201 | UV uaccum = 0; |
200 | int eaccum = 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; |
201 | |
209 | |
202 | for (;;) |
210 | for (;;) |
203 | { |
211 | { |
204 | U8 dig = (U8)*s - '0'; |
212 | U8 dig = (U8)*s - '0'; |
205 | |
213 | |
206 | if (expect_false (dig >= 10)) |
214 | if (expect_false (dig >= 10)) |
207 | { |
215 | { |
208 | if (dig == (U8)((U8)'.' - (U8)'0')) |
216 | if (dig == (U8)((U8)'.' - (U8)'0')) |
209 | { |
217 | { |
210 | ++s; |
218 | ++s; |
211 | json_atof_scan1 (s, accum, expo, 1); |
219 | json_atof_scan1 (s, accum, expo, 1, maxdepth); |
212 | } |
220 | } |
213 | else if ((dig | ' ') == 'e' - '0') |
221 | else if ((dig | ' ') == 'e' - '0') |
214 | { |
222 | { |
215 | int exp2 = 0; |
223 | int exp2 = 0; |
216 | int neg = 0; |
224 | int neg = 0; |
… | |
… | |
242 | // if we have too many digits, then recurse for more |
250 | // if we have too many digits, then recurse for more |
243 | // we actually do this for rather few digits |
251 | // we actually do this for rather few digits |
244 | if (uaccum >= (UV_MAX - 9) / 10) |
252 | if (uaccum >= (UV_MAX - 9) / 10) |
245 | { |
253 | { |
246 | if (postdp) *expo -= eaccum; |
254 | if (postdp) *expo -= eaccum; |
247 | json_atof_scan1 (s, accum, expo, postdp); |
255 | json_atof_scan1 (s, accum, expo, postdp, maxdepth); |
248 | if (postdp) *expo += eaccum; |
256 | if (postdp) *expo += eaccum; |
249 | |
257 | |
250 | break; |
258 | break; |
251 | } |
259 | } |
252 | } |
260 | } |
… | |
… | |
270 | { |
278 | { |
271 | ++s; |
279 | ++s; |
272 | neg = 1; |
280 | neg = 1; |
273 | } |
281 | } |
274 | |
282 | |
|
|
283 | // a recursion depth of ten gives us >>500 bits |
275 | json_atof_scan1 (s, &accum, &expo, 0); |
284 | json_atof_scan1 (s, &accum, &expo, 0, 10); |
276 | |
285 | |
277 | return neg ? -accum : accum; |
286 | return neg ? -accum : accum; |
278 | } |
287 | } |
279 | ///////////////////////////////////////////////////////////////////////////// |
288 | ///////////////////////////////////////////////////////////////////////////// |
280 | // encoder |
289 | // encoder |
… | |
… | |
1394 | dSP; |
1403 | dSP; |
1395 | int count; |
1404 | int count; |
1396 | |
1405 | |
1397 | ENTER; SAVETMPS; PUSHMARK (SP); |
1406 | ENTER; SAVETMPS; PUSHMARK (SP); |
1398 | XPUSHs (HeVAL (he)); |
1407 | XPUSHs (HeVAL (he)); |
|
|
1408 | sv_2mortal (sv); |
1399 | |
1409 | |
1400 | PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; |
1410 | PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; |
1401 | |
1411 | |
1402 | if (count == 1) |
1412 | if (count == 1) |
1403 | { |
1413 | { |
1404 | sv = newSVsv (POPs); |
1414 | sv = newSVsv (POPs); |
1405 | FREETMPS; LEAVE; |
1415 | FREETMPS; LEAVE; |
1406 | return sv; |
1416 | return sv; |
1407 | } |
1417 | } |
1408 | |
1418 | |
|
|
1419 | SvREFCNT_inc (sv); |
1409 | FREETMPS; LEAVE; |
1420 | FREETMPS; LEAVE; |
1410 | } |
1421 | } |
1411 | } |
1422 | } |
1412 | |
1423 | |
1413 | if (dec->json.cb_object) |
1424 | if (dec->json.cb_object) |
… | |
… | |
1509 | { |
1520 | { |
1510 | dec_t dec; |
1521 | dec_t dec; |
1511 | SV *sv; |
1522 | SV *sv; |
1512 | |
1523 | |
1513 | /* work around bugs in 5.10 where manipulating magic values |
1524 | /* work around bugs in 5.10 where manipulating magic values |
1514 | * will perl ignore the magic in subsequent accesses |
1525 | * will perl ignore the magic in subsequent accesses. |
|
|
1526 | * also make a copy of non-PV values, to get them into a clean |
|
|
1527 | * state (SvPV should do that, but it's buggy, see below). |
1515 | */ |
1528 | */ |
1516 | /*SvGETMAGIC (string);*/ |
1529 | /*SvGETMAGIC (string);*/ |
1517 | if (SvMAGICAL (string)) |
1530 | if (SvMAGICAL (string) || !SvPOK (string)) |
1518 | string = sv_2mortal (newSVsv (string)); |
1531 | string = sv_2mortal (newSVsv (string)); |
1519 | |
1532 | |
1520 | SvUPGRADE (string, SVt_PV); |
1533 | SvUPGRADE (string, SVt_PV); |
1521 | |
1534 | |
1522 | /* work around a bug in perl 5.10, which causes SvCUR to fail an |
1535 | /* work around a bug in perl 5.10, which causes SvCUR to fail an |
… | |
… | |
1539 | if (offset > json->max_size && json->max_size) |
1552 | if (offset > json->max_size && json->max_size) |
1540 | croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", |
1553 | croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", |
1541 | (unsigned long)SvCUR (string), (unsigned long)json->max_size); |
1554 | (unsigned long)SvCUR (string), (unsigned long)json->max_size); |
1542 | } |
1555 | } |
1543 | |
1556 | |
1544 | if (json->flags & F_UTF8) |
1557 | if (DECODE_WANTS_OCTETS (json)) |
1545 | sv_utf8_downgrade (string, 0); |
1558 | sv_utf8_downgrade (string, 0); |
1546 | else |
1559 | else |
1547 | sv_utf8_upgrade (string); |
1560 | sv_utf8_upgrade (string); |
1548 | |
1561 | |
1549 | SvGROW (string, SvCUR (string) + 1); // should basically be a NOP |
1562 | SvGROW (string, SvCUR (string) + 1); // should basically be a NOP |
… | |
… | |
1920 | PPCODE: |
1933 | PPCODE: |
1921 | { |
1934 | { |
1922 | if (!self->incr_text) |
1935 | if (!self->incr_text) |
1923 | self->incr_text = newSVpvn ("", 0); |
1936 | self->incr_text = newSVpvn ("", 0); |
1924 | |
1937 | |
|
|
1938 | /* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */ |
|
|
1939 | if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text)) |
|
|
1940 | if (DECODE_WANTS_OCTETS (self)) |
|
|
1941 | { |
|
|
1942 | if (self->incr_pos) |
|
|
1943 | self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text), |
|
|
1944 | (U8 *)SvPVX (self->incr_text) + self->incr_pos); |
|
|
1945 | |
|
|
1946 | sv_utf8_downgrade (self->incr_text, 0); |
|
|
1947 | } |
|
|
1948 | else |
|
|
1949 | { |
|
|
1950 | sv_utf8_upgrade (self->incr_text); |
|
|
1951 | |
|
|
1952 | if (self->incr_pos) |
|
|
1953 | self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos) |
|
|
1954 | - (U8 *)SvPVX (self->incr_text); |
|
|
1955 | } |
|
|
1956 | |
1925 | // append data, if any |
1957 | // append data, if any |
1926 | if (jsonstr) |
1958 | if (jsonstr) |
1927 | { |
1959 | { |
|
|
1960 | /* make sure both strings have same encoding */ |
|
|
1961 | if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text)) |
1928 | if (SvUTF8 (jsonstr)) |
1962 | if (SvUTF8 (jsonstr)) |
|
|
1963 | sv_utf8_downgrade (jsonstr, 0); |
1929 | { |
1964 | else |
1930 | if (!SvUTF8 (self->incr_text)) |
|
|
1931 | { |
|
|
1932 | /* utf-8-ness differs, need to upgrade */ |
|
|
1933 | sv_utf8_upgrade (self->incr_text); |
|
|
1934 | |
|
|
1935 | if (self->incr_pos) |
|
|
1936 | self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos) |
|
|
1937 | - (U8 *)SvPVX (self->incr_text); |
|
|
1938 | } |
|
|
1939 | } |
|
|
1940 | else if (SvUTF8 (self->incr_text)) |
|
|
1941 | sv_utf8_upgrade (jsonstr); |
1965 | sv_utf8_upgrade (jsonstr); |
1942 | |
1966 | |
|
|
1967 | /* and then just blindly append */ |
1943 | { |
1968 | { |
1944 | STRLEN len; |
1969 | STRLEN len; |
1945 | const char *str = SvPV (jsonstr, len); |
1970 | const char *str = SvPV (jsonstr, len); |
1946 | STRLEN cur = SvCUR (self->incr_text); |
1971 | STRLEN cur = SvCUR (self->incr_text); |
1947 | |
1972 | |