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.85 by root, Sat Apr 5 18:15:46 2008 UTC vs.
Revision 1.87 by root, Tue Jun 3 06:43:45 2008 UTC

121 121
122INLINE void 122INLINE void
123shrink (SV *sv) 123shrink (SV *sv)
124{ 124{
125 sv_utf8_downgrade (sv, 1); 125 sv_utf8_downgrade (sv, 1);
126
126 if (SvLEN (sv) > SvCUR (sv) + 1) 127 if (SvLEN (sv) > SvCUR (sv) + 1)
127 { 128 {
128#ifdef SvPV_shrink_to_cur 129#ifdef SvPV_shrink_to_cur
129 SvPV_shrink_to_cur (sv); 130 SvPV_shrink_to_cur (sv);
130#elif defined (SvPV_renew) 131#elif defined (SvPV_renew)
1413 SV *sv; 1414 SV *sv;
1414 1415
1415 SvGETMAGIC (string); 1416 SvGETMAGIC (string);
1416 SvUPGRADE (string, SVt_PV); 1417 SvUPGRADE (string, SVt_PV);
1417 1418
1419 /* work around a bug in perl 5.10, which causes SvCUR to fail an
1420 * assertion with -DDEBUGGING, although SvCUR is documented to
1421 * return the xpv_cur field which certainly exists after upgrading.
1422 * according to nicholas clark, calling SvPOK fixes this.
1423 */
1424 SvPOK (string);
1425
1418 if (SvCUR (string) > json->max_size && json->max_size) 1426 if (SvCUR (string) > json->max_size && json->max_size)
1419 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 1427 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1420 (unsigned long)SvCUR (string), (unsigned long)json->max_size); 1428 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1421 1429
1422 if (json->flags & F_UTF8) 1430 if (json->flags & F_UTF8)
1841 self->incr_nest = 0; 1849 self->incr_nest = 0;
1842 self->incr_mode = 0; 1850 self->incr_mode = 0;
1843 } 1851 }
1844} 1852}
1845 1853
1854void incr_reset (JSON *self)
1855 CODE:
1856{
1857 SvREFCNT_dec (self->incr_text);
1858 self->incr_text = 0;
1859 self->incr_pos = 0;
1860 self->incr_nest = 0;
1861 self->incr_mode = 0;
1862}
1863
1846void DESTROY (JSON *self) 1864void DESTROY (JSON *self)
1847 CODE: 1865 CODE:
1848 SvREFCNT_dec (self->cb_sk_object); 1866 SvREFCNT_dec (self->cb_sk_object);
1849 SvREFCNT_dec (self->cb_object); 1867 SvREFCNT_dec (self->cb_object);
1850 SvREFCNT_dec (self->incr_text); 1868 SvREFCNT_dec (self->incr_text);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines