| … | |
… | |
| 79 | INCR_M_STR, // inside string |
79 | INCR_M_STR, // inside string |
| 80 | INCR_M_BS, // inside backslash |
80 | INCR_M_BS, // inside backslash |
| 81 | INCR_M_JSON // outside anything, count nesting |
81 | INCR_M_JSON // outside anything, count nesting |
| 82 | }; |
82 | }; |
| 83 | |
83 | |
| 84 | #define INCR_DONE(json) (!(json)->incr_nest && (json)->incr_mode == INCR_M_JSON) |
84 | #define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON) |
| 85 | |
85 | |
| 86 | typedef struct { |
86 | typedef struct { |
| 87 | U32 flags; |
87 | U32 flags; |
| 88 | U32 max_depth; |
88 | U32 max_depth; |
| 89 | STRLEN max_size; |
89 | STRLEN max_size; |
| … | |
… | |
| 92 | HV *cb_sk_object; |
92 | HV *cb_sk_object; |
| 93 | |
93 | |
| 94 | // for the incremental parser |
94 | // for the incremental parser |
| 95 | SV *incr_text; // the source text so far |
95 | SV *incr_text; // the source text so far |
| 96 | STRLEN incr_pos; // the current offset into the text |
96 | STRLEN incr_pos; // the current offset into the text |
| 97 | unsigned char incr_nest; // {[]}-nesting level |
97 | int incr_nest; // {[]}-nesting level |
| 98 | unsigned char incr_mode; |
98 | unsigned char incr_mode; |
| 99 | } JSON; |
99 | } JSON; |
| 100 | |
100 | |
| 101 | INLINE void |
101 | INLINE void |
| 102 | json_init (JSON *json) |
102 | json_init (JSON *json) |
| … | |
… | |
| 1418 | |
1418 | |
| 1419 | /* work around a bug in perl 5.10, which causes SvCUR to fail an |
1419 | /* work around a bug in perl 5.10, which causes SvCUR to fail an |
| 1420 | * assertion with -DDEBUGGING, although SvCUR is documented to |
1420 | * assertion with -DDEBUGGING, although SvCUR is documented to |
| 1421 | * return the xpv_cur field which certainly exists after upgrading. |
1421 | * return the xpv_cur field which certainly exists after upgrading. |
| 1422 | * according to nicholas clark, calling SvPOK fixes this. |
1422 | * according to nicholas clark, calling SvPOK fixes this. |
|
|
1423 | * But it doesn't fix it, so try another workaround, call SvPV_nolen |
|
|
1424 | * and hope for the best. |
| 1423 | */ |
1425 | */ |
|
|
1426 | #ifdef DEBUGGING |
| 1424 | SvPOK (string); |
1427 | SvPV_nolen (string); |
|
|
1428 | #endif |
| 1425 | |
1429 | |
| 1426 | if (SvCUR (string) > json->max_size && json->max_size) |
1430 | if (SvCUR (string) > json->max_size && json->max_size) |
| 1427 | croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", |
1431 | croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", |
| 1428 | (unsigned long)SvCUR (string), (unsigned long)json->max_size); |
1432 | (unsigned long)SvCUR (string), (unsigned long)json->max_size); |
| 1429 | |
1433 | |
| … | |
… | |
| 1598 | croak (ERR_NESTING_EXCEEDED); |
1602 | croak (ERR_NESTING_EXCEEDED); |
| 1599 | break; |
1603 | break; |
| 1600 | |
1604 | |
| 1601 | case ']': |
1605 | case ']': |
| 1602 | case '}': |
1606 | case '}': |
| 1603 | if (!--self->incr_nest) |
1607 | if (--self->incr_nest <= 0) |
| 1604 | goto interrupt; |
1608 | goto interrupt; |
| 1605 | } |
1609 | } |
| 1606 | } |
1610 | } |
| 1607 | } |
1611 | } |
| 1608 | |
1612 | |
