[ViewVC] Diff of: cvs/JSON-XS/XS.xs

Comparing JSON-XS/XS.xs (file contents):
Revision 1.76 by root, Thu Mar 20 00:56:37 2008 UTC vs.
Revision 1.100 by root, Sat Sep 5 23:00:56 2009 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	#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 2)	22	#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 2)
…		…
31	#define F_ALLOW_NONREF 0x00000100UL	31	#define F_ALLOW_NONREF 0x00000100UL
32	#define F_SHRINK 0x00000200UL	32	#define F_SHRINK 0x00000200UL
33	#define F_ALLOW_BLESSED 0x00000400UL	33	#define F_ALLOW_BLESSED 0x00000400UL
34	#define F_CONV_BLESSED 0x00000800UL	34	#define F_CONV_BLESSED 0x00000800UL
35	#define F_RELAXED 0x00001000UL	35	#define F_RELAXED 0x00001000UL
36		36	#define F_ALLOW_UNKNOWN 0x00002000UL
37	#define F_MAXDEPTH 0xf8000000UL
38	#define S_MAXDEPTH 27
39	#define F_MAXSIZE 0x01f00000UL
40	#define S_MAXSIZE 20
41	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing	37	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
42		38
43	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
44	#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
45
46	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER	39	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER
47	#define F_DEFAULT (9UL << S_MAXDEPTH)
48		40
49	#define INIT_SIZE 32 // initial scalar size to be allocated	41	#define INIT_SIZE 32 // initial scalar size to be allocated
50	#define INDENT_STEP 3 // spaces per indentation level	42	#define INDENT_STEP 3 // spaces per indentation level
51		43
52	#define SHORT_STRING_LEN 16384 // special-case strings of up to this size	44	#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
…		…
67		59
68	#define IN_RANGE_INC(type,val,beg,end) \	60	#define IN_RANGE_INC(type,val,beg,end) \
69	((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \	61	((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \
70	<= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))	62	<= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
71		63
		64	#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"
		65
72	#ifdef USE_ITHREADS	66	#ifdef USE_ITHREADS
73	# define JSON_SLOW 1	67	# define JSON_SLOW 1
74	# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))	68	# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
75	#else	69	#else
76	# define JSON_SLOW 0	70	# define JSON_SLOW 0
…		…
78	#endif	72	#endif
79		73
80	static HV json_stash, json_boolean_stash; // JSON::XS::	74	static HV json_stash, json_boolean_stash; // JSON::XS::
81	static SV json_true, json_false;	75	static SV json_true, json_false;
82		76
		77	enum {
		78	INCR_M_WS = 0, // initial whitespace skipping, must be 0
		79	INCR_M_STR, // inside string
		80	INCR_M_BS, // inside backslash
		81	INCR_M_JSON // outside anything, count nesting
		82	};
		83
		84	#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
		85
83	typedef struct {	86	typedef struct {
84	U32 flags;	87	U32 flags;
		88	U32 max_depth;
		89	STRLEN max_size;
		90
85	SV *cb_object;	91	SV *cb_object;
86	HV *cb_sk_object;	92	HV *cb_sk_object;
		93
		94	// for the incremental parser
		95	SV *incr_text; // the source text so far
		96	STRLEN incr_pos; // the current offset into the text
		97	int incr_nest; // {[]}-nesting level
		98	unsigned char incr_mode;
87	} JSON;	99	} JSON;
		100
		101	INLINE void
		102	json_init (JSON *json)
		103	{
		104	Zero (json, 1, JSON);
		105	json->max_depth = 512;
		106	}
88		107
89	/////////////////////////////////////////////////////////////////////////////	108	/////////////////////////////////////////////////////////////////////////////
90	// utility functions	109	// utility functions
91		110
		111	INLINE SV *
		112	get_bool (const char *name)
		113	{
		114	SV *sv = get_sv (name, 1);
		115
		116	SvREADONLY_on (sv);
		117	SvREADONLY_on (SvRV (sv));
		118
		119	return sv;
		120	}
		121
92	INLINE void	122	INLINE void
93	shrink (SV *sv)	123	shrink (SV *sv)
94	{	124	{
95	sv_utf8_downgrade (sv, 1);	125	sv_utf8_downgrade (sv, 1);
		126
96	if (SvLEN (sv) > SvCUR (sv) + 1)	127	if (SvLEN (sv) > SvCUR (sv) + 1)
97	{	128	{
98	#ifdef SvPV_shrink_to_cur	129	#ifdef SvPV_shrink_to_cur
99	SvPV_shrink_to_cur (sv);	130	SvPV_shrink_to_cur (sv);
100	#elif defined (SvPV_renew)	131	#elif defined (SvPV_renew)
…		…
144	*s++ = 0x80 \| ( ch & 0x3f);	175	*s++ = 0x80 \| ( ch & 0x3f);
145		176
146	return s;	177	return s;
147	}	178	}
148		179
		180	// convert offset pointer to character index, sv must be string
		181	static STRLEN
		182	ptr_to_index (SV sv, char offset)
		183	{
		184	return SvUTF8 (sv)
		185	? utf8_distance (offset, SvPVX (sv))
		186	: offset - SvPVX (sv);
		187	}
		188
149	/////////////////////////////////////////////////////////////////////////////	189	/////////////////////////////////////////////////////////////////////////////
150	// encoder	190	// encoder
151		191
152	// structure used for encoding JSON	192	// structure used for encoding JSON
153	typedef struct	193	typedef struct
…		…
155	char *cur; // SvPVX (sv) + current output position	195	char *cur; // SvPVX (sv) + current output position
156	char *end; // SvEND (sv)	196	char *end; // SvEND (sv)
157	SV *sv; // result scalar	197	SV *sv; // result scalar
158	JSON json;	198	JSON json;
159	U32 indent; // indentation level	199	U32 indent; // indentation level
160	U32 maxdepth; // max. indentation/recursion level
161	UV limit; // escape character values >= this value when encoding	200	UV limit; // escape character values >= this value when encoding
162	} enc_t;	201	} enc_t;
163		202
164	INLINE void	203	INLINE void
165	need (enc_t *enc, STRLEN len)	204	need (enc_t *enc, STRLEN len)
166	{	205	{
167	if (expect_false (enc->cur + len >= enc->end))	206	if (expect_false (enc->cur + len >= enc->end))
168	{	207	{
169	STRLEN cur = enc->cur - SvPVX (enc->sv);	208	STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
170	SvGROW (enc->sv, cur + len + 1);	209	SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
171	enc->cur = SvPVX (enc->sv) + cur;	210	enc->cur = SvPVX (enc->sv) + cur;
172	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;	211	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
173	}	212	}
174	}	213	}
175		214
…		…
250	(int)((uch - 0x10000) % 0x400 + 0xDC00));	289	(int)((uch - 0x10000) % 0x400 + 0xDC00));
251	enc->cur += 12;	290	enc->cur += 12;
252	}	291	}
253	else	292	else
254	{	293	{
255	static char hexdigit [16] = "0123456789abcdef";
256	need (enc, len += 5);	294	need (enc, len += 5);
257	*enc->cur++ = '\\';	295	*enc->cur++ = '\\';
258	*enc->cur++ = 'u';	296	*enc->cur++ = 'u';
259	*enc->cur++ = hexdigit [ uch >> 12 ];	297	*enc->cur++ = PL_hexdigit [ uch >> 12 ];
260	*enc->cur++ = hexdigit [(uch >> 8) & 15];	298	*enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
261	*enc->cur++ = hexdigit [(uch >> 4) & 15];	299	*enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
262	*enc->cur++ = hexdigit [(uch >> 0) & 15];	300	*enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
263	}	301	}
264		302
265	str += clen;	303	str += clen;
266	}	304	}
267	else if (enc->json.flags & F_LATIN1)	305	else if (enc->json.flags & F_LATIN1)
…		…
338	static void	376	static void
339	encode_av (enc_t enc, AV av)	377	encode_av (enc_t enc, AV av)
340	{	378	{
341	int i, len = av_len (av);	379	int i, len = av_len (av);
342		380
343	if (enc->indent >= enc->maxdepth)	381	if (enc->indent >= enc->json.max_depth)
344	croak ("data structure too deep (hit recursion limit)");	382	croak (ERR_NESTING_EXCEEDED);
345		383
346	encode_ch (enc, '[');	384	encode_ch (enc, '[');
347		385
348	if (len >= 0)	386	if (len >= 0)
349	{	387	{
…		…
423		461
424	static void	462	static void
425	encode_hv (enc_t enc, HV hv)	463	encode_hv (enc_t enc, HV hv)
426	{	464	{
427	HE *he;	465	HE *he;
428	int count;
429		466
430	if (enc->indent >= enc->maxdepth)	467	if (enc->indent >= enc->json.max_depth)
431	croak ("data structure too deep (hit recursion limit)");	468	croak (ERR_NESTING_EXCEEDED);
432		469
433	encode_ch (enc, '{');	470	encode_ch (enc, '{');
434		471
435	// for canonical output we have to sort by keys first	472	// for canonical output we have to sort by keys first
436	// actually, this is mostly due to the stupid so-called	473	// actually, this is mostly due to the stupid so-called
437	// security workaround added somewhere in 5.8.x.	474	// security workaround added somewhere in 5.8.x
438	// that randomises hash orderings	475	// that randomises hash orderings
439	if (enc->json.flags & F_CANONICAL)	476	if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
440	{	477	{
441	int count = hv_iterinit (hv);	478	int count = hv_iterinit (hv);
442		479
443	if (SvMAGICAL (hv))	480	if (SvMAGICAL (hv))
444	{	481	{
…		…
617		654
618	if (len == 1 && *pv == '1')	655	if (len == 1 && *pv == '1')
619	encode_str (enc, "true", 4, 0);	656	encode_str (enc, "true", 4, 0);
620	else if (len == 1 && *pv == '0')	657	else if (len == 1 && *pv == '0')
621	encode_str (enc, "false", 5, 0);	658	encode_str (enc, "false", 5, 0);
		659	else if (enc->json.flags & F_ALLOW_UNKNOWN)
		660	encode_str (enc, "null", 4, 0);
622	else	661	else
623	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",	662	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
624	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	663	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
625	}	664	}
		665	else if (enc->json.flags & F_ALLOW_UNKNOWN)
		666	encode_str (enc, "null", 4, 0);
626	else	667	else
627	croak ("encountered %s, but JSON can only represent references to arrays or hashes",	668	croak ("encountered %s, but JSON can only represent references to arrays or hashes",
628	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	669	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
629	}	670	}
630		671
…		…
692	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));	733	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
693	}	734	}
694	}	735	}
695	else if (SvROK (sv))	736	else if (SvROK (sv))
696	encode_rv (enc, SvRV (sv));	737	encode_rv (enc, SvRV (sv));
697	else if (!SvOK (sv))	738	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)
698	encode_str (enc, "null", 4, 0);	739	encode_str (enc, "null", 4, 0);
699	else	740	else
700	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",	741	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
701	SvPV_nolen (sv), SvFLAGS (sv));	742	SvPV_nolen (sv), SvFLAGS (sv));
702	}	743	}
…		…
712	enc.json = *json;	753	enc.json = *json;
713	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	754	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
714	enc.cur = SvPVX (enc.sv);	755	enc.cur = SvPVX (enc.sv);
715	enc.end = SvEND (enc.sv);	756	enc.end = SvEND (enc.sv);
716	enc.indent = 0;	757	enc.indent = 0;
717	enc.maxdepth = DEC_DEPTH (enc.json.flags);
718	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL	758	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
719	: enc.json.flags & F_LATIN1 ? 0x000100UL	759	: enc.json.flags & F_LATIN1 ? 0x000100UL
720	: 0x110000UL;	760	: 0x110000UL;
721		761
722	SvPOK_only (enc.sv);	762	SvPOK_only (enc.sv);
723	encode_sv (&enc, scalar);	763	encode_sv (&enc, scalar);
		764	encode_nl (&enc);
724		765
725	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	766	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
726	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	767	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
727		768
728	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))	769	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))
…		…
789	if (*dec->cur != ch) \	830	if (*dec->cur != ch) \
790	ERR (# ch " expected"); \	831	ERR (# ch " expected"); \
791	++dec->cur; \	832	++dec->cur; \
792	SE	833	SE
793		834
794	#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)")	835	#define DEC_INC_DEPTH if (++dec->depth > dec->json.max_depth) ERR (ERR_NESTING_EXCEEDED)
795	#define DEC_DEC_DEPTH --dec->depth	836	#define DEC_DEC_DEPTH --dec->depth
796		837
797	static SV decode_sv (dec_t dec);	838	static SV decode_sv (dec_t dec);
798		839
799	static signed char decode_hexdigit[256];	840	static signed char decode_hexdigit[256];
…		…
939	{	980	{
940	STRLEN len = cur - buf;	981	STRLEN len = cur - buf;
941		982
942	if (sv)	983	if (sv)
943	{	984	{
944	SvGROW (sv, SvCUR (sv) + len + 1);	985	STRLEN cur = SvCUR (sv);
		986
		987	if (SvLEN (sv) <= cur + len)
		988	SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
		989
945	memcpy (SvPVX (sv) + SvCUR (sv), buf, len);	990	memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
946	SvCUR_set (sv, SvCUR (sv) + len);	991	SvCUR_set (sv, SvCUR (sv) + len);
947	}	992	}
948	else	993	else
949	sv = newSVpvn (buf, len);	994	sv = newSVpvn (buf, len);
…		…
1040		1085
1041	// special case the rather common 1..5-digit-int case	1086	// special case the rather common 1..5-digit-int case
1042	if (*start == '-')	1087	if (*start == '-')
1043	switch (len)	1088	switch (len)
1044	{	1089	{
1045	case 2: return newSViv (-( start [1] - '0' * 1));	1090	case 2: return newSViv (-(IV)( start [1] - '0' * 1));
1046	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));	1091	case 3: return newSViv (-(IV)( start [1] * 10 + start [2] - '0' * 11));
1047	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));	1092	case 4: return newSViv (-(IV)( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
1048	case 5: return newSViv (-( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));	1093	case 5: return newSViv (-(IV)( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
1049	case 6: return newSViv (-(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));	1094	case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
1050	}	1095	}
1051	else	1096	else
1052	switch (len)	1097	switch (len)
1053	{	1098	{
1054	case 1: return newSViv ( start [0] - '0' * 1);	1099	case 1: return newSViv ( start [0] - '0' * 1);
1055	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);	1100	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
1056	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);	1101	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
1057	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);	1102	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
1058	case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);	1103	case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
1059	}	1104	}
1060		1105
1061	{	1106	{
1062	UV uv;	1107	UV uv;
1063	int numtype = grok_number (start, len, &uv);	1108	int numtype = grok_number (start, len, &uv);
…		…
1171	char *p = dec->cur;	1216	char *p = dec->cur;
1172	char *e = p + 24; // only try up to 24 bytes	1217	char *e = p + 24; // only try up to 24 bytes
1173		1218
1174	for (;;)	1219	for (;;)
1175	{	1220	{
1176	// the >= 0x80 is true on most architectures	1221	// the >= 0x80 is false on most architectures
1177	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')	1222	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')
1178	{	1223	{
1179	// slow path, back up and use decode_str	1224	// slow path, back up and use decode_str
1180	SV *key = decode_str (dec);	1225	SV *key = decode_str (dec);
1181	if (!key)	1226	if (!key)
…		…
1329	case 't':	1374	case 't':
1330	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1375	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1331	{	1376	{
1332	dec->cur += 4;	1377	dec->cur += 4;
1333	#if JSON_SLOW	1378	#if JSON_SLOW
1334	json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true);	1379	json_true = get_bool ("JSON::XS::true");
1335	#endif	1380	#endif
1336	return SvREFCNT_inc (json_true);	1381	return newSVsv (json_true);
1337	}	1382	}
1338	else	1383	else
1339	ERR ("'true' expected");	1384	ERR ("'true' expected");
1340		1385
1341	break;	1386	break;
…		…
1343	case 'f':	1388	case 'f':
1344	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1389	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1345	{	1390	{
1346	dec->cur += 5;	1391	dec->cur += 5;
1347	#if JSON_SLOW	1392	#if JSON_SLOW
1348	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1393	json_false = get_bool ("JSON::XS::false");
1349	#endif	1394	#endif
1350	return SvREFCNT_inc (json_false);	1395	return newSVsv (json_false);
1351	}	1396	}
1352	else	1397	else
1353	ERR ("'false' expected");	1398	ERR ("'false' expected");
1354		1399
1355	break;	1400	break;
…		…
1373	fail:	1418	fail:
1374	return 0;	1419	return 0;
1375	}	1420	}
1376		1421
1377	static SV *	1422	static SV *
1378	decode_json (SV string, JSON json, UV *offset_return)	1423	decode_json (SV string, JSON json, char **offset_return)
1379	{	1424	{
1380	dec_t dec;	1425	dec_t dec;
1381	UV offset;
1382	SV *sv;	1426	SV *sv;
1383		1427
		1428	/* work around bugs in 5.10 where manipulating magic values
		1429	* will perl ignore the magic in subsequent accesses
		1430	*/
1384	SvGETMAGIC (string);	1431	/SvGETMAGIC (string);/
		1432	if (SvMAGICAL (string))
		1433	string = sv_2mortal (newSVsv (string));
		1434
1385	SvUPGRADE (string, SVt_PV);	1435	SvUPGRADE (string, SVt_PV);
1386		1436
1387	if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))	1437	/* work around a bug in perl 5.10, which causes SvCUR to fail an
		1438	* assertion with -DDEBUGGING, although SvCUR is documented to
		1439	* return the xpv_cur field which certainly exists after upgrading.
		1440	* according to nicholas clark, calling SvPOK fixes this.
		1441	* But it doesn't fix it, so try another workaround, call SvPV_nolen
		1442	* and hope for the best.
		1443	* Damnit, SvPV_nolen still trips over yet another assertion. This
		1444	* assertion business is seriously broken, try yet another workaround
		1445	* for the broken -DDEBUGGING.
		1446	*/
		1447	{
		1448	#ifdef DEBUGGING
		1449	STRLEN offset = SvOK (string) ? sv_len (string) : 0;
		1450	#else
		1451	STRLEN offset = SvCUR (string);
		1452	#endif
		1453
		1454	if (offset > json->max_size && json->max_size)
1388	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",	1455	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1389	(unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));	1456	(unsigned long)SvCUR (string), (unsigned long)json->max_size);
		1457	}
1390		1458
1391	if (json->flags & F_UTF8)	1459	if (json->flags & F_UTF8)
1392	sv_utf8_downgrade (string, 0);	1460	sv_utf8_downgrade (string, 0);
1393	else	1461	else
1394	sv_utf8_upgrade (string);	1462	sv_utf8_upgrade (string);
1395		1463
1396	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1464	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1397		1465
1398	dec.json = *json;	1466	dec.json = *json;
1399	dec.cur = SvPVX (string);	1467	dec.cur = SvPVX (string);
1400	dec.end = SvEND (string);	1468	dec.end = SvEND (string);
1401	dec.err = 0;	1469	dec.err = 0;
1402	dec.depth = 0;	1470	dec.depth = 0;
1403	dec.maxdepth = DEC_DEPTH (dec.json.flags);
1404		1471
1405	if (dec.json.cb_object \|\| dec.json.cb_sk_object)	1472	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
1406	dec.json.flags \|= F_HOOK;	1473	dec.json.flags \|= F_HOOK;
1407		1474
1408	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1475	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
1409		1476
1410	decode_ws (&dec);	1477	decode_ws (&dec);
1411	sv = decode_sv (&dec);	1478	sv = decode_sv (&dec);
		1479
		1480	if (offset_return)
		1481	*offset_return = dec.cur;
1412		1482
1413	if (!(offset_return \|\| !sv))	1483	if (!(offset_return \|\| !sv))
1414	{	1484	{
1415	// check for trailing garbage	1485	// check for trailing garbage
1416	decode_ws (&dec);	1486	decode_ws (&dec);
…		…
1419	{	1489	{
1420	dec.err = "garbage after JSON object";	1490	dec.err = "garbage after JSON object";
1421	SvREFCNT_dec (sv);	1491	SvREFCNT_dec (sv);
1422	sv = 0;	1492	sv = 0;
1423	}	1493	}
1424	}
1425
1426	if (offset_return \|\| !sv)
1427	{
1428	offset = dec.json.flags & F_UTF8
1429	? dec.cur - SvPVX (string)
1430	: utf8_distance (dec.cur, SvPVX (string));
1431
1432	if (offset_return)
1433	*offset_return = offset;
1434	}	1494	}
1435		1495
1436	if (!sv)	1496	if (!sv)
1437	{	1497	{
1438	SV *uni = sv_newmortal ();	1498	SV *uni = sv_newmortal ();
…		…
1444	SAVEVPTR (PL_curcop);	1504	SAVEVPTR (PL_curcop);
1445	PL_curcop = &cop;	1505	PL_curcop = &cop;
1446	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);	1506	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1447	LEAVE;	1507	LEAVE;
1448		1508
1449	croak ("%s, at character offset %d [\"%s\"]",	1509	croak ("%s, at character offset %d (before \"%s\")",
1450	dec.err,	1510	dec.err,
1451	(int)offset,	1511	ptr_to_index (string, dec.cur),
1452	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1512	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1453	}	1513	}
1454		1514
1455	sv = sv_2mortal (sv);	1515	sv = sv_2mortal (sv);
1456		1516
1457	if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))	1517	if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))
1458	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");	1518	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1459		1519
1460	return sv;	1520	return sv;
		1521	}
		1522
		1523	/////////////////////////////////////////////////////////////////////////////
		1524	// incremental parser
		1525
		1526	static void
		1527	incr_parse (JSON *self)
		1528	{
		1529	const char *p = SvPVX (self->incr_text) + self->incr_pos;
		1530
		1531	for (;;)
		1532	{
		1533	//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
		1534	switch (self->incr_mode)
		1535	{
		1536	// only used for intiial whitespace skipping
		1537	case INCR_M_WS:
		1538	for (;;)
		1539	{
		1540	if (*p > 0x20)
		1541	{
		1542	self->incr_mode = INCR_M_JSON;
		1543	goto incr_m_json;
		1544	}
		1545	else if (!*p)
		1546	goto interrupt;
		1547
		1548	++p;
		1549	}
		1550
		1551	// skip a single char inside a string (for \\-processing)
		1552	case INCR_M_BS:
		1553	if (!*p)
		1554	goto interrupt;
		1555
		1556	++p;
		1557	self->incr_mode = INCR_M_STR;
		1558	goto incr_m_str;
		1559
		1560	// inside a string
		1561	case INCR_M_STR:
		1562	incr_m_str:
		1563	for (;;)
		1564	{
		1565	if (*p == '"')
		1566	{
		1567	++p;
		1568	self->incr_mode = INCR_M_JSON;
		1569
		1570	if (!self->incr_nest)
		1571	goto interrupt;
		1572
		1573	goto incr_m_json;
		1574	}
		1575	else if (*p == '\\')
		1576	{
		1577	++p; // "virtually" consumes character after \
		1578
		1579	if (!*p) // if at end of string we have to switch modes
		1580	{
		1581	self->incr_mode = INCR_M_BS;
		1582	goto interrupt;
		1583	}
		1584	}
		1585	else if (!*p)
		1586	goto interrupt;
		1587
		1588	++p;
		1589	}
		1590
		1591	// after initial ws, outside string
		1592	case INCR_M_JSON:
		1593	incr_m_json:
		1594	for (;;)
		1595	{
		1596	switch (*p++)
		1597	{
		1598	case 0:
		1599	--p;
		1600	goto interrupt;
		1601
		1602	case 0x09:
		1603	case 0x0a:
		1604	case 0x0d:
		1605	case 0x20:
		1606	if (!self->incr_nest)
		1607	{
		1608	--p; // do not eat the whitespace, let the next round do it
		1609	goto interrupt;
		1610	}
		1611	break;
		1612
		1613	case '"':
		1614	self->incr_mode = INCR_M_STR;
		1615	goto incr_m_str;
		1616
		1617	case '[':
		1618	case '{':
		1619	if (++self->incr_nest > self->max_depth)
		1620	croak (ERR_NESTING_EXCEEDED);
		1621	break;
		1622
		1623	case ']':
		1624	case '}':
		1625	if (--self->incr_nest <= 0)
		1626	goto interrupt;
		1627	}
		1628	}
		1629	}
		1630
		1631	modechange:
		1632	;
		1633	}
		1634
		1635	interrupt:
		1636	self->incr_pos = p - SvPVX (self->incr_text);
		1637	//printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1461	}	1638	}
1462		1639
1463	/////////////////////////////////////////////////////////////////////////////	1640	/////////////////////////////////////////////////////////////////////////////
1464	// XS interface functions	1641	// XS interface functions
1465		1642
…		…
1477	: -1;	1654	: -1;
1478		1655
1479	json_stash = gv_stashpv ("JSON::XS" , 1);	1656	json_stash = gv_stashpv ("JSON::XS" , 1);
1480	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);	1657	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1481		1658
1482	json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );	1659	json_true = get_bool ("JSON::XS::true");
1483	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1660	json_false = get_bool ("JSON::XS::false");
		1661
		1662	CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1484	}	1663	}
1485		1664
1486	PROTOTYPES: DISABLE	1665	PROTOTYPES: DISABLE
1487		1666
1488	void CLONE (...)	1667	void CLONE (...)
…		…
1493	void new (char *klass)	1672	void new (char *klass)
1494	PPCODE:	1673	PPCODE:
1495	{	1674	{
1496	SV *pv = NEWSV (0, sizeof (JSON));	1675	SV *pv = NEWSV (0, sizeof (JSON));
1497	SvPOK_only (pv);	1676	SvPOK_only (pv);
1498	Zero (SvPVX (pv), 1, JSON);	1677	json_init ((JSON *)SvPVX (pv));
1499	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1500	XPUSHs (sv_2mortal (sv_bless (	1678	XPUSHs (sv_2mortal (sv_bless (
1501	newRV_noinc (pv),	1679	newRV_noinc (pv),
1502	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)	1680	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1503	)));	1681	)));
1504	}	1682	}
…		…
1516	allow_nonref = F_ALLOW_NONREF	1694	allow_nonref = F_ALLOW_NONREF
1517	shrink = F_SHRINK	1695	shrink = F_SHRINK
1518	allow_blessed = F_ALLOW_BLESSED	1696	allow_blessed = F_ALLOW_BLESSED
1519	convert_blessed = F_CONV_BLESSED	1697	convert_blessed = F_CONV_BLESSED
1520	relaxed = F_RELAXED	1698	relaxed = F_RELAXED
		1699	allow_unknown = F_ALLOW_UNKNOWN
1521	PPCODE:	1700	PPCODE:
1522	{	1701	{
1523	if (enable)	1702	if (enable)
1524	self->flags \|= ix;	1703	self->flags \|= ix;
1525	else	1704	else
…		…
1540	get_allow_nonref = F_ALLOW_NONREF	1719	get_allow_nonref = F_ALLOW_NONREF
1541	get_shrink = F_SHRINK	1720	get_shrink = F_SHRINK
1542	get_allow_blessed = F_ALLOW_BLESSED	1721	get_allow_blessed = F_ALLOW_BLESSED
1543	get_convert_blessed = F_CONV_BLESSED	1722	get_convert_blessed = F_CONV_BLESSED
1544	get_relaxed = F_RELAXED	1723	get_relaxed = F_RELAXED
		1724	get_allow_unknown = F_ALLOW_UNKNOWN
1545	PPCODE:	1725	PPCODE:
1546	XPUSHs (boolSV (self->flags & ix));	1726	XPUSHs (boolSV (self->flags & ix));
1547		1727
1548	void max_depth (JSON *self, UV max_depth = 0x80000000UL)	1728	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1549	PPCODE:	1729	PPCODE:
1550	{	1730	self->max_depth = max_depth;
1551	UV log2 = 0;
1552
1553	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1554
1555	while ((1UL << log2) < max_depth)
1556	++log2;
1557
1558	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);
1559
1560	XPUSHs (ST (0));	1731	XPUSHs (ST (0));
1561	}
1562		1732
1563	U32 get_max_depth (JSON *self)	1733	U32 get_max_depth (JSON *self)
1564	CODE:	1734	CODE:
1565	RETVAL = DEC_DEPTH (self->flags);	1735	RETVAL = self->max_depth;
1566	OUTPUT:	1736	OUTPUT:
1567	RETVAL	1737	RETVAL
1568		1738
1569	void max_size (JSON *self, UV max_size = 0)	1739	void max_size (JSON *self, U32 max_size = 0)
1570	PPCODE:	1740	PPCODE:
1571	{	1741	self->max_size = max_size;
1572	UV log2 = 0;
1573
1574	if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1575	if (max_size == 1) max_size = 2;
1576
1577	while ((1UL << log2) < max_size)
1578	++log2;
1579
1580	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
1581
1582	XPUSHs (ST (0));	1742	XPUSHs (ST (0));
1583	}
1584		1743
1585	int get_max_size (JSON *self)	1744	int get_max_size (JSON *self)
1586	CODE:	1745	CODE:
1587	RETVAL = DEC_SIZE (self->flags);	1746	RETVAL = self->max_size;
1588	OUTPUT:	1747	OUTPUT:
1589	RETVAL	1748	RETVAL
1590		1749
1591	void filter_json_object (JSON self, SV cb = &PL_sv_undef)	1750	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
1592	PPCODE:	1751	PPCODE:
…		…
1628	XPUSHs (decode_json (jsonstr, self, 0));	1787	XPUSHs (decode_json (jsonstr, self, 0));
1629		1788
1630	void decode_prefix (JSON self, SV jsonstr)	1789	void decode_prefix (JSON self, SV jsonstr)
1631	PPCODE:	1790	PPCODE:
1632	{	1791	{
1633	UV offset;	1792	char *offset;
1634	EXTEND (SP, 2);	1793	EXTEND (SP, 2);
1635	PUSHs (decode_json (jsonstr, self, &offset));	1794	PUSHs (decode_json (jsonstr, self, &offset));
1636	PUSHs (sv_2mortal (newSVuv (offset)));	1795	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
		1796	}
		1797
		1798	void incr_parse (JSON self, SV jsonstr = 0)
		1799	PPCODE:
		1800	{
		1801	if (!self->incr_text)
		1802	self->incr_text = newSVpvn ("", 0);
		1803
		1804	// append data, if any
		1805	if (jsonstr)
		1806	{
		1807	if (SvUTF8 (jsonstr))
		1808	{
		1809	if (!SvUTF8 (self->incr_text))
		1810	{
		1811	/* utf-8-ness differs, need to upgrade */
		1812	sv_utf8_upgrade (self->incr_text);
		1813
		1814	if (self->incr_pos)
		1815	self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
		1816	- (U8 *)SvPVX (self->incr_text);
		1817	}
		1818	}
		1819	else if (SvUTF8 (self->incr_text))
		1820	sv_utf8_upgrade (jsonstr);
		1821
		1822	{
		1823	STRLEN len;
		1824	const char *str = SvPV (jsonstr, len);
		1825	STRLEN cur = SvCUR (self->incr_text);
		1826
		1827	if (SvLEN (self->incr_text) <= cur + len)
		1828	SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
		1829
		1830	Move (str, SvEND (self->incr_text), len, char);
		1831	SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
		1832	*SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
		1833	}
		1834	}
		1835
		1836	if (GIMME_V != G_VOID)
		1837	do
		1838	{
		1839	char *offset;
		1840
		1841	if (!INCR_DONE (self))
		1842	{
		1843	incr_parse (self);
		1844
		1845	if (self->incr_pos > self->max_size && self->max_size)
		1846	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
		1847	(unsigned long)self->incr_pos, (unsigned long)self->max_size);
		1848
		1849	if (!INCR_DONE (self))
		1850	break;
		1851	}
		1852
		1853	XPUSHs (decode_json (self->incr_text, self, &offset));
		1854
		1855	self->incr_pos -= offset - SvPVX (self->incr_text);
		1856	self->incr_nest = 0;
		1857	self->incr_mode = 0;
		1858
		1859	sv_chop (self->incr_text, offset);
		1860	}
		1861	while (GIMME_V == G_ARRAY);
		1862	}
		1863
		1864	SV incr_text (JSON self)
		1865	ATTRS: lvalue
		1866	CODE:
		1867	{
		1868	if (self->incr_pos)
		1869	croak ("incr_text can not be called when the incremental parser already started parsing");
		1870
		1871	RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef;
		1872	}
		1873	OUTPUT:
		1874	RETVAL
		1875
		1876	void incr_skip (JSON *self)
		1877	CODE:
		1878	{
		1879	if (self->incr_pos)
		1880	{
		1881	sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + self->incr_pos);
		1882	self->incr_pos = 0;
		1883	self->incr_nest = 0;
		1884	self->incr_mode = 0;
		1885	}
		1886	}
		1887
		1888	void incr_reset (JSON *self)
		1889	CODE:
		1890	{
		1891	SvREFCNT_dec (self->incr_text);
		1892	self->incr_text = 0;
		1893	self->incr_pos = 0;
		1894	self->incr_nest = 0;
		1895	self->incr_mode = 0;
1637	}	1896	}
1638		1897
1639	void DESTROY (JSON *self)	1898	void DESTROY (JSON *self)
1640	CODE:	1899	CODE:
1641	SvREFCNT_dec (self->cb_sk_object);	1900	SvREFCNT_dec (self->cb_sk_object);
1642	SvREFCNT_dec (self->cb_object);	1901	SvREFCNT_dec (self->cb_object);
		1902	SvREFCNT_dec (self->incr_text);
1643		1903
1644	PROTOTYPES: ENABLE	1904	PROTOTYPES: ENABLE
1645		1905
1646	void encode_json (SV *scalar)	1906	void encode_json (SV *scalar)
1647	ALIAS:	1907	ALIAS:
1648	to_json_ = 0	1908	to_json_ = 0
1649	encode_json = F_UTF8	1909	encode_json = F_UTF8
1650	PPCODE:	1910	PPCODE:
1651	{	1911	{
1652	JSON json = { F_DEFAULT \| ix };	1912	JSON json;
		1913	json_init (&json);
		1914	json.flags \|= ix;
1653	XPUSHs (encode_json (scalar, &json));	1915	XPUSHs (encode_json (scalar, &json));
1654	}	1916	}
1655		1917
1656	void decode_json (SV *jsonstr)	1918	void decode_json (SV *jsonstr)
1657	ALIAS:	1919	ALIAS:
1658	from_json_ = 0	1920	from_json_ = 0
1659	decode_json = F_UTF8	1921	decode_json = F_UTF8
1660	PPCODE:	1922	PPCODE:
1661	{	1923	{
1662	JSON json = { F_DEFAULT \| ix };	1924	JSON json;
		1925	json_init (&json);
		1926	json.flags \|= ix;
1663	XPUSHs (decode_json (jsonstr, &json, 0));	1927	XPUSHs (decode_json (jsonstr, &json, 0));
1664	}	1928	}
1665		1929
		1930

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.76 by root, Thu Mar 20 00:56:37 2008 UTC vs. Revision 1.100 by root, Sat Sep 5 23:00:56 2009 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.76 by root, Thu Mar 20 00:56:37 2008 UTC vs.
Revision 1.100 by root, Sat Sep 5 23:00:56 2009 UTC