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

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.6 by root, Sat Oct 26 22:25:47 2013 UTC vs.
Revision 1.34 by root, Sat Nov 30 16:19:59 2013 UTC

…		…
9	#include <limits.h>	9	#include <limits.h>
10	#include <float.h>	10	#include <float.h>
11		11
12	#include "ecb.h"	12	#include "ecb.h"
13		13
		14	// compatibility with perl <5.18
		15	#ifndef HvNAMELEN_get
		16	# define HvNAMELEN_get(hv) strlen (HvNAME (hv))
		17	#endif
		18	#ifndef HvNAMELEN
		19	# define HvNAMELEN(hv) HvNAMELEN_get (hv)
		20	#endif
		21	#ifndef HvNAMEUTF8
		22	# define HvNAMEUTF8(hv) 0
		23	#endif
		24	#ifndef SvREFCNT_dec_NN
		25	# define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
		26	#endif
		27
		28	// known tags
		29	enum cbor_tag
		30	{
		31	// extensions
		32	CBOR_TAG_STRINGREF = 25, // http://cbor.schmorp.de/stringref
		33	CBOR_TAG_PERL_OBJECT = 26, // http://cbor.schmorp.de/perl-object
		34	CBOR_TAG_GENERIC_OBJECT = 27, // http://cbor.schmorp.de/generic-object
		35	CBOR_TAG_VALUE_SHAREABLE = 28, // http://cbor.schmorp.de/value-sharing
		36	CBOR_TAG_VALUE_SHAREDREF = 29, // http://cbor.schmorp.de/value-sharing
		37	CBOR_TAG_STRINGREF_NAMESPACE = 256, // http://cbor.schmorp.de/stringref
		38	CBOR_TAG_INDIRECTION = 22098, // http://cbor.schmorp.de/indirection
		39
		40	// rfc7049
		41	CBOR_TAG_DATETIME = 0, // rfc4287, utf-8
		42	CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any
		43	CBOR_TAG_POS_BIGNUM = 2, // byte string
		44	CBOR_TAG_NEG_BIGNUM = 3, // byte string
		45	CBOR_TAG_DECIMAL = 4, // decimal fraction, array
		46	CBOR_TAG_BIGFLOAT = 5, // array
		47
		48	CBOR_TAG_CONV_B64U = 21, // base64url, any
		49	CBOR_TAG_CONV_B64 = 22, // base64, any
		50	CBOR_TAG_CONV_HEX = 23, // base16, any
		51	CBOR_TAG_CBOR = 24, // embedded cbor, byte string
		52
		53	CBOR_TAG_URI = 32, // URI rfc3986, utf-8
		54	CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8
		55	CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8
		56	CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8
		57	CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
		58
		59	CBOR_TAG_MAGIC = 55799 // self-describe cbor
		60	};
		61
14	#define F_SHRINK 0x00000200UL	62	#define F_SHRINK 0x00000001UL
15	#define F_ALLOW_UNKNOWN 0x00002000UL	63	#define F_ALLOW_UNKNOWN 0x00000002UL
		64	#define F_ALLOW_SHARING 0x00000004UL
		65	#define F_PACK_STRINGS 0x00000008UL
16		66
17	#define INIT_SIZE 32 // initial scalar size to be allocated	67	#define INIT_SIZE 32 // initial scalar size to be allocated
18		68
19	#define SB do {	69	#define SB do {
20	#define SE } while (0)	70	#define SE } while (0)
…		…
31	#else	81	#else
32	# define CBOR_SLOW 0	82	# define CBOR_SLOW 0
33	# define CBOR_STASH cbor_stash	83	# define CBOR_STASH cbor_stash
34	#endif	84	#endif
35		85
36	static HV cbor_stash, cbor_boolean_stash, *cbor_tagged_stash; // CBOR::XS::	86	static HV cbor_stash, types_boolean_stash, types_error_stash, cbor_tagged_stash; // CBOR::XS::
37	static SV cbor_true, cbor_false;	87	static SV types_true, types_false, types_error, sv_cbor, *default_filter;
38		88
39	typedef struct {	89	typedef struct {
40	U32 flags;	90	U32 flags;
41	U32 max_depth;	91	U32 max_depth;
42	STRLEN max_size;	92	STRLEN max_size;
		93	SV *filter;
43	} CBOR;	94	} CBOR;
44		95
45	ecb_inline void	96	ecb_inline void
46	cbor_init (CBOR *cbor)	97	cbor_init (CBOR *cbor)
47	{	98	{
48	Zero (cbor, 1, CBOR);	99	Zero (cbor, 1, CBOR);
49	cbor->max_depth = 512;	100	cbor->max_depth = 512;
		101	}
		102
		103	ecb_inline void
		104	cbor_free (CBOR *cbor)
		105	{
		106	SvREFCNT_dec (cbor->filter);
50	}	107	}
51		108
52	/////////////////////////////////////////////////////////////////////////////	109	/////////////////////////////////////////////////////////////////////////////
53	// utility functions	110	// utility functions
54		111
…		…
76	SvPV_renew (sv, SvCUR (sv) + 1);	133	SvPV_renew (sv, SvCUR (sv) + 1);
77	#endif	134	#endif
78	}	135	}
79	}	136	}
80		137
81	/////////////////////////////////////////////////////////////////////////////	138	// minimum length of a string to be registered for stringref
82	// fp hell	139	ecb_inline int
83		140	minimum_string_length (UV idx)
84	//TODO	141	{
		142	return idx > 23
		143	? idx > 0xffU
		144	? idx > 0xffffU
		145	? idx > 0xffffffffU
		146	? 11
		147	: 7
		148	: 5
		149	: 4
		150	: 3;
		151	}
85		152
86	/////////////////////////////////////////////////////////////////////////////	153	/////////////////////////////////////////////////////////////////////////////
87	// encoder	154	// encoder
88		155
89	// structure used for encoding CBOR	156	// structure used for encoding CBOR
…		…
92	char *cur; // SvPVX (sv) + current output position	159	char *cur; // SvPVX (sv) + current output position
93	char *end; // SvEND (sv)	160	char *end; // SvEND (sv)
94	SV *sv; // result scalar	161	SV *sv; // result scalar
95	CBOR cbor;	162	CBOR cbor;
96	U32 depth; // recursion level	163	U32 depth; // recursion level
		164	HV *stringref[2]; // string => index, or 0 ([0] = bytes, [1] = utf-8)
		165	UV stringref_idx;
		166	HV *shareable; // ptr => index, or 0
		167	UV shareable_idx;
97	} enc_t;	168	} enc_t;
98		169
99	ecb_inline void	170	ecb_inline void
100	need (enc_t *enc, STRLEN len)	171	need (enc_t *enc, STRLEN len)
101	{	172	{
…		…
118	static void	189	static void
119	encode_uint (enc_t *enc, int major, UV len)	190	encode_uint (enc_t *enc, int major, UV len)
120	{	191	{
121	need (enc, 9);	192	need (enc, 9);
122		193
123	if (len < 24)	194	if (ecb_expect_true (len < 24))
124	*enc->cur++ = major \| len;	195	*enc->cur++ = major \| len;
125	else if (len <= 0xff)	196	else if (ecb_expect_true (len <= 0xff))
126	{	197	{
127	*enc->cur++ = major \| 24;	198	*enc->cur++ = major \| 24;
128	*enc->cur++ = len;	199	*enc->cur++ = len;
129	}	200	}
130	else if (len <= 0xffff)	201	else if (len <= 0xffff)
…		…
153	*enc->cur++ = len >> 8;	224	*enc->cur++ = len >> 8;
154	*enc->cur++ = len;	225	*enc->cur++ = len;
155	}	226	}
156	}	227	}
157		228
158	static void	229	ecb_inline void
		230	encode_tag (enc_t *enc, UV tag)
		231	{
		232	encode_uint (enc, 0xc0, tag);
		233	}
		234
		235	ecb_inline void
159	encode_str (enc_t enc, int utf8, char str, STRLEN len)	236	encode_str (enc_t enc, int utf8, char str, STRLEN len)
160	{	237	{
161	encode_uint (enc, utf8 ? 0x60 : 0x40, len);	238	encode_uint (enc, utf8 ? 0x60 : 0x40, len);
162	need (enc, len);	239	need (enc, len);
163	memcpy (enc->cur, str, len);	240	memcpy (enc->cur, str, len);
164	enc->cur += len;	241	enc->cur += len;
165	}	242	}
166		243
		244	static void
		245	encode_strref (enc_t enc, int utf8, char str, STRLEN len)
		246	{
		247	if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS))
		248	{
		249	SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);
		250
		251	if (SvOK (*svp))
		252	{
		253	// already registered, use stringref
		254	encode_tag (enc, CBOR_TAG_STRINGREF);
		255	encode_uint (enc, 0x00, SvUV (*svp));
		256	return;
		257	}
		258	else if (len >= minimum_string_length (enc->stringref_idx))
		259	{
		260	// register only
		261	sv_setuv (*svp, enc->stringref_idx);
		262	++enc->stringref_idx;
		263	}
		264	}
		265
		266	encode_str (enc, utf8, str, len);
		267	}
		268
167	static void encode_sv (enc_t enc, SV sv);	269	static void encode_sv (enc_t enc, SV sv);
168		270
169	static void	271	static void
170	encode_av (enc_t enc, AV av)	272	encode_av (enc_t enc, AV av)
171	{	273	{
…		…
208	while ((he = hv_iternext (hv)))	310	while ((he = hv_iternext (hv)))
209	{	311	{
210	if (HeKLEN (he) == HEf_SVKEY)	312	if (HeKLEN (he) == HEf_SVKEY)
211	encode_sv (enc, HeSVKEY (he));	313	encode_sv (enc, HeSVKEY (he));
212	else	314	else
213	encode_str (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));	315	encode_strref (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));
214		316
215	encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));	317	encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));
216	}	318	}
217		319
218	if (mg)	320	if (mg)
…		…
223		325
224	// encode objects, arrays and special \0=false and \1=true values.	326	// encode objects, arrays and special \0=false and \1=true values.
225	static void	327	static void
226	encode_rv (enc_t enc, SV sv)	328	encode_rv (enc_t enc, SV sv)
227	{	329	{
228	svtype svt;
229
230	SvGETMAGIC (sv);	330	SvGETMAGIC (sv);
		331
231	svt = SvTYPE (sv);	332	svtype svt = SvTYPE (sv);
232		333
233	if (ecb_expect_false (SvOBJECT (sv)))	334	if (ecb_expect_false (SvOBJECT (sv)))
234	{	335	{
235	HV *boolean_stash = !CBOR_SLOW \|\| cbor_boolean_stash	336	HV *boolean_stash = !CBOR_SLOW \|\| types_boolean_stash
236	? cbor_boolean_stash	337	? types_boolean_stash
237	: gv_stashpv ("CBOR::XS::Boolean", 1);	338	: gv_stashpv ("Types::Serialiser::Boolean", 1);
		339	HV *error_stash = !CBOR_SLOW \|\| types_error_stash
		340	? types_error_stash
		341	: gv_stashpv ("Types::Serialiser::Error", 1);
238	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash	342	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
239	? cbor_tagged_stash	343	? cbor_tagged_stash
240	: gv_stashpv ("CBOR::XS::Tagged" , 1);	344	: gv_stashpv ("CBOR::XS::Tagged" , 1);
241		345
		346	HV *stash = SvSTASH (sv);
		347
242	if (SvSTASH (sv) == boolean_stash)	348	if (stash == boolean_stash)
		349	{
243	encode_ch (enc, SvIV (sv) ? 0xe0 \| 21 : 0xe0 \| 20);	350	encode_ch (enc, SvIV (sv) ? 0xe0 \| 21 : 0xe0 \| 20);
		351	return;
		352	}
		353	else if (stash == error_stash)
		354	{
		355	encode_ch (enc, 0xe0 \| 23);
		356	return;
		357	}
244	else if (SvSTASH (sv) == tagged_stash)	358	else if (stash == tagged_stash)
245	{	359	{
246	if (svt != SVt_PVAV)	360	if (svt != SVt_PVAV)
247	croak ("encountered CBOR::XS::Tagged object that isn't an array");	361	croak ("encountered CBOR::XS::Tagged object that isn't an array");
248		362
249	encode_uint (enc, 0xc0, SvUV (av_fetch ((AV )sv, 0, 1)));	363	encode_uint (enc, 0xc0, SvUV (av_fetch ((AV )sv, 0, 1)));
250	encode_sv (enc, av_fetch ((AV )sv, 1, 1));	364	encode_sv (enc, av_fetch ((AV )sv, 1, 1));
		365
		366	return;
		367	}
		368	}
		369
		370	if (ecb_expect_false (SvREFCNT (sv) > 1)
		371	&& ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING))
		372	{
		373	if (!enc->shareable)
		374	enc->shareable = (HV )sv_2mortal ((SV )newHV ());
		375
		376	SV *svp = hv_fetch (enc->shareable, (char )&sv, sizeof (sv), 1);
		377
		378	if (SvOK (*svp))
		379	{
		380	encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
		381	encode_uint (enc, 0x00, SvUV (*svp));
		382	return;
251	}	383	}
252	else	384	else
253	{	385	{
		386	sv_setuv (*svp, enc->shareable_idx);
		387	++enc->shareable_idx;
		388	encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
		389	}
		390	}
		391
		392	if (ecb_expect_false (SvOBJECT (sv)))
		393	{
		394	HV *stash = SvSTASH (sv);
		395	GV *method;
		396
		397	if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
		398	{
		399	dSP;
		400
		401	ENTER; SAVETMPS; PUSHMARK (SP);
254	// we re-bless the reference to get overload and other niceties right	402	// we re-bless the reference to get overload and other niceties right
255	GV *to_cbor = gv_fetchmethod_autoload (SvSTASH (sv), "TO_CBOR", 0);
256
257	if (to_cbor)
258	{
259	dSP;
260
261	ENTER; SAVETMPS; PUSHMARK (SP);
262	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));	403	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
263		404
264	// calling with G_SCALAR ensures that we always get a 1 return value
265	PUTBACK;	405	PUTBACK;
		406	// G_SCALAR ensures that return value is 1
266	call_sv ((SV *)GvCV (to_cbor), G_SCALAR);	407	call_sv ((SV *)GvCV (method), G_SCALAR);
267	SPAGAIN;	408	SPAGAIN;
268		409
269	// catch this surprisingly common error	410	// catch this surprisingly common error
270	if (SvROK (TOPs) && SvRV (TOPs) == sv)	411	if (SvROK (TOPs) && SvRV (TOPs) == sv)
271	croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));	412	croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (stash));
272		413
273	sv = POPs;	414	encode_sv (enc, POPs);
		415
274	PUTBACK;	416	PUTBACK;
275		417
276	encode_sv (enc, sv);
277
278	FREETMPS; LEAVE;	418	FREETMPS; LEAVE;
279	}	419	}
		420	else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
		421	{
		422	dSP;
		423
		424	ENTER; SAVETMPS; PUSHMARK (SP);
		425	EXTEND (SP, 2);
		426	// we re-bless the reference to get overload and other niceties right
		427	PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		428	PUSHs (sv_cbor);
		429
		430	PUTBACK;
		431	int count = call_sv ((SV *)GvCV (method), G_ARRAY);
		432	SPAGAIN;
		433
		434	// catch this surprisingly common error
		435	if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
		436	croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
		437
		438	encode_tag (enc, CBOR_TAG_PERL_OBJECT);
		439	encode_uint (enc, 0x80, count + 1);
		440	encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
		441
		442	while (count)
		443	encode_sv (enc, SP[1 - count--]);
		444
		445	PUTBACK;
		446
		447	FREETMPS; LEAVE;
		448	}
280	else	449	else
281	croak ("encountered object '%s', but no TO_CBOR method available on it",	450	croak ("encountered object '%s', but no TO_CBOR or FREEZE methods available on it",
282	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	451	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
283	}
284	}	452	}
285	else if (svt == SVt_PVHV)	453	else if (svt == SVt_PVHV)
286	encode_hv (enc, (HV *)sv);	454	encode_hv (enc, (HV *)sv);
287	else if (svt == SVt_PVAV)	455	else if (svt == SVt_PVAV)
288	encode_av (enc, (AV *)sv);	456	encode_av (enc, (AV *)sv);
289	else if (svt < SVt_PVAV)
290	{
291	STRLEN len = 0;
292	char *pv = svt ? SvPV (sv, len) : 0;
293
294	if (len == 1 && *pv == '1')
295	encode_ch (enc, 0xe0 \| 21);
296	else if (len == 1 && *pv == '0')
297	encode_ch (enc, 0xe0 \| 20);
298	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
299	encode_ch (enc, 0xe0 \| 23);
300	else
301	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
302	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
303	}
304	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
305	encode_ch (enc, 0xe0 \| 23);
306	else	457	else
307	croak ("encountered %s, but CBOR can only represent references to arrays or hashes",	458	{
308	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	459	encode_tag (enc, CBOR_TAG_INDIRECTION);
		460	encode_sv (enc, sv);
		461	}
309	}	462	}
310		463
311	static void	464	static void
312	encode_nv (enc_t enc, SV sv)	465	encode_nv (enc_t enc, SV sv)
313	{	466	{
…		…
351		504
352	if (SvPOKp (sv))	505	if (SvPOKp (sv))
353	{	506	{
354	STRLEN len;	507	STRLEN len;
355	char *str = SvPV (sv, len);	508	char *str = SvPV (sv, len);
356	encode_str (enc, SvUTF8 (sv), str, len);	509	encode_strref (enc, SvUTF8 (sv), str, len);
357	}	510	}
358	else if (SvNOKp (sv))	511	else if (SvNOKp (sv))
359	encode_nv (enc, sv);	512	encode_nv (enc, sv);
360	else if (SvIOKp (sv))	513	else if (SvIOKp (sv))
361	{	514	{
…		…
378	}	531	}
379		532
380	static SV *	533	static SV *
381	encode_cbor (SV scalar, CBOR cbor)	534	encode_cbor (SV scalar, CBOR cbor)
382	{	535	{
383	enc_t enc;	536	enc_t enc = { };
384		537
385	enc.cbor = *cbor;	538	enc.cbor = *cbor;
386	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	539	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
387	enc.cur = SvPVX (enc.sv);	540	enc.cur = SvPVX (enc.sv);
388	enc.end = SvEND (enc.sv);	541	enc.end = SvEND (enc.sv);
389	enc.depth = 0;
390		542
391	SvPOK_only (enc.sv);	543	SvPOK_only (enc.sv);
		544
		545	if (cbor->flags & F_PACK_STRINGS)
		546	{
		547	encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE);
		548	enc.stringref[0]= (HV )sv_2mortal ((SV )newHV ());
		549	enc.stringref[1]= (HV )sv_2mortal ((SV )newHV ());
		550	}
		551
392	encode_sv (&enc, scalar);	552	encode_sv (&enc, scalar);
393		553
394	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	554	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
395	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	555	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
396		556
…		…
410	U8 *end; // end of input string	570	U8 *end; // end of input string
411	const char *err; // parse error, if != 0	571	const char *err; // parse error, if != 0
412	CBOR cbor;	572	CBOR cbor;
413	U32 depth; // recursion depth	573	U32 depth; // recursion depth
414	U32 maxdepth; // recursion depth limit	574	U32 maxdepth; // recursion depth limit
		575	AV *shareable;
		576	AV *stringref;
		577	SV *decode_tagged;
415	} dec_t;	578	} dec_t;
416		579
417	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE	580	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE
418		581
419	#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")	582	#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")
…		…
451	\| ((UV)dec->cur[-1]);	614	\| ((UV)dec->cur[-1]);
452		615
453	case 27:	616	case 27:
454	WANT (9);	617	WANT (9);
455	dec->cur += 9;	618	dec->cur += 9;
		619
		620	return
		621	#if UVSIZE < 8
		622	0
		623	#else
456	return (((UV)dec->cur[-8]) << 56)	624	(((UV)dec->cur[-8]) << 56)
457	\| (((UV)dec->cur[-7]) << 48)	625	\| (((UV)dec->cur[-7]) << 48)
458	\| (((UV)dec->cur[-6]) << 40)	626	\| (((UV)dec->cur[-6]) << 40)
459	\| (((UV)dec->cur[-5]) << 32)	627	\| (((UV)dec->cur[-5]) << 32)
		628	#endif
460	\| (((UV)dec->cur[-4]) << 24)	629	\| (((UV)dec->cur[-4]) << 24)
461	\| (((UV)dec->cur[-3]) << 16)	630	\| (((UV)dec->cur[-3]) << 16)
462	\| (((UV)dec->cur[-2]) << 8)	631	\| (((UV)dec->cur[-2]) << 8)
463	\| ((UV)dec->cur[-1]);	632	\| ((UV)dec->cur[-1]);
464		633
…		…
513	SvREFCNT_dec (av);	682	SvREFCNT_dec (av);
514	DEC_DEC_DEPTH;	683	DEC_DEC_DEPTH;
515	return &PL_sv_undef;	684	return &PL_sv_undef;
516	}	685	}
517		686
		687	static void
		688	decode_he (dec_t dec, HV hv)
		689	{
		690	// for speed reasons, we specialcase single-string
		691	// byte or utf-8 strings as keys, but only when !stringref
		692
		693	if (ecb_expect_true (!dec->stringref))
		694	if (dec->cur >= 0x40 && dec->cur <= 0x40 + 27)
		695	{
		696	I32 len = decode_uint (dec);
		697	char key = (char )dec->cur;
		698
		699	dec->cur += len;
		700
		701	if (ecb_expect_false (dec->stringref))
		702	av_push (dec->stringref, newSVpvn (key, len));
		703
		704	hv_store (hv, key, len, decode_sv (dec), 0);
		705
		706	return;
		707	}
		708	else if (dec->cur >= 0x60 && dec->cur <= 0x60 + 27)
		709	{
		710	I32 len = decode_uint (dec);
		711	char key = (char )dec->cur;
		712
		713	dec->cur += len;
		714
		715	if (ecb_expect_false (dec->stringref))
		716	av_push (dec->stringref, newSVpvn_utf8 (key, len, 1));
		717
		718	hv_store (hv, key, -len, decode_sv (dec), 0);
		719
		720	return;
		721	}
		722
		723	SV *k = decode_sv (dec);
		724	SV *v = decode_sv (dec);
		725
		726	hv_store_ent (hv, k, v, 0);
		727	SvREFCNT_dec (k);
		728	}
		729
518	static SV *	730	static SV *
519	decode_hv (dec_t *dec)	731	decode_hv (dec_t *dec)
520	{	732	{
521	HV *hv = newHV ();	733	HV *hv = newHV ();
522		734
…		…
534	{	746	{
535	++dec->cur;	747	++dec->cur;
536	break;	748	break;
537	}	749	}
538		750
539	SV *k = decode_sv (dec);	751	decode_he (dec, hv);
540	SV *v = decode_sv (dec);
541
542	hv_store_ent (hv, k, v, 0);
543	}	752	}
544	}	753	}
545	else	754	else
546	{	755	{
547	int len = decode_uint (dec);	756	int pairs = decode_uint (dec);
548		757
549	while (len--)	758	while (pairs--)
550	{	759	decode_he (dec, hv);
551	SV *k = decode_sv (dec);
552	SV *v = decode_sv (dec);
553
554	hv_store_ent (hv, k, v, 0);
555	}
556	}	760	}
557		761
558	DEC_DEC_DEPTH;	762	DEC_DEC_DEPTH;
559	return newRV_noinc ((SV *)hv);	763	return newRV_noinc ((SV *)hv);
560		764
…		…
569	{	773	{
570	SV *sv = 0;	774	SV *sv = 0;
571		775
572	if ((*dec->cur & 31) == 31)	776	if ((*dec->cur & 31) == 31)
573	{	777	{
		778	// indefinite length strings
574	++dec->cur;	779	++dec->cur;
575		780
		781	unsigned char major = *dec->cur & 0xe0;
		782
576	sv = newSVpvn ("", 0);	783	sv = newSVpvn ("", 0);
577		784
578	// not very fast, and certainly not robust against illegal input
579	for (;;)	785	for (;;)
580	{	786	{
581	WANT (1);	787	WANT (1);
582		788
		789	if ((*dec->cur ^ major) >= 31)
583	if (*dec->cur == (0xe0 \| 31))	790	if (*dec->cur == (0xe0 \| 31))
584	{	791	{
585	++dec->cur;	792	++dec->cur;
586	break;	793	break;
587	}	794	}
		795	else
		796	ERR ("corrupted CBOR data (invalid chunks in indefinite length string)");
588		797
589	sv_catsv (sv, decode_sv (dec));	798	STRLEN len = decode_uint (dec);
		799
		800	WANT (len);
		801	sv_catpvn (sv, dec->cur, len);
		802	dec->cur += len;
590	}	803	}
591	}	804	}
592	else	805	else
593	{	806	{
594	STRLEN len = decode_uint (dec);	807	STRLEN len = decode_uint (dec);
595		808
596	WANT (len);	809	WANT (len);
597	sv = newSVpvn (dec->cur, len);	810	sv = newSVpvn (dec->cur, len);
598	dec->cur += len;	811	dec->cur += len;
		812
		813	if (ecb_expect_false (dec->stringref)
		814	&& SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1))
		815	av_push (dec->stringref, SvREFCNT_inc_NN (sv));
599	}	816	}
600		817
601	if (utf8)	818	if (utf8)
602	SvUTF8_on (sv);	819	SvUTF8_on (sv);
603		820
…		…
609	}	826	}
610		827
611	static SV *	828	static SV *
612	decode_tagged (dec_t *dec)	829	decode_tagged (dec_t *dec)
613	{	830	{
		831	SV *sv = 0;
614	UV tag = decode_uint (dec);	832	UV tag = decode_uint (dec);
		833
		834	WANT (1);
		835
		836	switch (tag)
		837	{
		838	case CBOR_TAG_MAGIC:
		839	sv = decode_sv (dec);
		840	break;
		841
		842	case CBOR_TAG_INDIRECTION:
		843	sv = newRV_noinc (decode_sv (dec));
		844	break;
		845
		846	case CBOR_TAG_STRINGREF_NAMESPACE:
		847	{
		848	ENTER; SAVETMPS;
		849
		850	SAVESPTR (dec->stringref);
		851	dec->stringref = (AV )sv_2mortal ((SV )newAV ());
		852
		853	sv = decode_sv (dec);
		854
		855	FREETMPS; LEAVE;
		856	}
		857	break;
		858
		859	case CBOR_TAG_STRINGREF:
		860	{
		861	if ((*dec->cur >> 5) != 0)
		862	ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
		863
		864	UV idx = decode_uint (dec);
		865
		866	if (!dec->stringref \|\| (int)idx > AvFILLp (dec->stringref))
		867	ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)");
		868
		869	sv = newSVsv (AvARRAY (dec->stringref)[idx]);
		870	}
		871	break;
		872
		873	case CBOR_TAG_VALUE_SHAREABLE:
		874	{
		875	if (ecb_expect_false (!dec->shareable))
		876	dec->shareable = (AV )sv_2mortal ((SV )newAV ());
		877
		878	sv = newSV (0);
		879	av_push (dec->shareable, SvREFCNT_inc_NN (sv));
		880
615	SV *sv = decode_sv (dec);	881	SV *osv = decode_sv (dec);
		882	sv_setsv (sv, osv);
		883	SvREFCNT_dec_NN (osv);
		884	}
		885	break;
616		886
617	if (tag == 55799) // 2.4.5 Self-Describe CBOR	887	case CBOR_TAG_VALUE_SHAREDREF:
		888	{
		889	if ((*dec->cur >> 5) != 0)
		890	ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
		891
		892	UV idx = decode_uint (dec);
		893
		894	if (!dec->shareable \|\| (int)idx > AvFILLp (dec->shareable))
		895	ERR ("corrupted CBOR data (sharedref index out of bounds)");
		896
		897	sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
		898	}
		899	break;
		900
		901	case CBOR_TAG_PERL_OBJECT:
		902	{
		903	sv = decode_sv (dec);
		904
		905	if (!SvROK (sv) \|\| SvTYPE (SvRV (sv)) != SVt_PVAV)
		906	ERR ("corrupted CBOR data (non-array perl object)");
		907
		908	AV av = (AV )SvRV (sv);
		909	int len = av_len (av) + 1;
		910	HV stash = gv_stashsv (av_fetch (av, 0, 1), 0);
		911
		912	if (!stash)
		913	ERR ("cannot decode perl-object (package does not exist)");
		914
		915	GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
		916
		917	if (!method)
		918	ERR ("cannot decode perl-object (package does not have a THAW method)");
		919
		920	dSP;
		921
		922	ENTER; SAVETMPS; PUSHMARK (SP);
		923	EXTEND (SP, len + 1);
		924	// we re-bless the reference to get overload and other niceties right
		925	PUSHs (*av_fetch (av, 0, 1));
		926	PUSHs (sv_cbor);
		927
		928	int i;
		929
		930	for (i = 1; i < len; ++i)
		931	PUSHs (*av_fetch (av, i, 1));
		932
		933	PUTBACK;
		934	call_sv ((SV *)GvCV (method), G_SCALAR \| G_EVAL);
		935	SPAGAIN;
		936
		937	if (SvTRUE (ERRSV))
		938	{
		939	FREETMPS; LEAVE;
		940	ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
		941	}
		942
		943	SvREFCNT_dec (sv);
		944	sv = SvREFCNT_inc (POPs);
		945
		946	PUTBACK;
		947
		948	FREETMPS; LEAVE;
		949	}
		950	break;
		951
		952	default:
		953	{
		954	sv = decode_sv (dec);
		955
		956	dSP;
		957	ENTER; SAVETMPS; PUSHMARK (SP);
		958	EXTEND (SP, 2);
		959	PUSHs (newSVuv (tag));
		960	PUSHs (sv);
		961
		962	PUTBACK;
		963	int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY \| G_EVAL);
		964	SPAGAIN;
		965
		966	if (SvTRUE (ERRSV))
		967	{
		968	FREETMPS; LEAVE;
		969	ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
		970	}
		971
		972	if (count)
		973	{
		974	SvREFCNT_dec (sv);
		975	sv = SvREFCNT_inc (POPs);
		976	}
		977	else
		978	{
		979	AV *av = newAV ();
		980	av_push (av, newSVuv (tag));
		981	av_push (av, sv);
		982
		983	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
		984	? cbor_tagged_stash
		985	: gv_stashpv ("CBOR::XS::Tagged" , 1);
		986	sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash);
		987	}
		988
		989	PUTBACK;
		990
		991	FREETMPS; LEAVE;
		992	}
		993	break;
		994	}
		995
618	return sv;	996	return sv;
619		997
620	AV *av = newAV ();	998	fail:
621	av_push (av, newSVuv (tag));	999	SvREFCNT_dec (sv);
622	av_push (av, sv);	1000	return &PL_sv_undef;
623	return newRV_noinc ((SV *)av);
624	}	1001	}
625		1002
626	static SV *	1003	static SV *
627	decode_sv (dec_t *dec)	1004	decode_sv (dec_t *dec)
628	{	1005	{
…		…
647	case 7: // misc	1024	case 7: // misc
648	switch (*dec->cur++ & 31)	1025	switch (*dec->cur++ & 31)
649	{	1026	{
650	case 20:	1027	case 20:
651	#if CBOR_SLOW	1028	#if CBOR_SLOW
652	cbor_false = get_bool ("CBOR::XS::false");	1029	types_false = get_bool ("Types::Serialiser::false");
653	#endif	1030	#endif
654	return newSVsv (cbor_false);	1031	return newSVsv (types_false);
655	case 21:	1032	case 21:
656	#if CBOR_SLOW	1033	#if CBOR_SLOW
657	cbor_true = get_bool ("CBOR::XS::true");	1034	types_true = get_bool ("Types::Serialiser::true");
658	#endif	1035	#endif
659	return newSVsv (cbor_true);	1036	return newSVsv (types_true);
660	case 22:	1037	case 22:
661	return newSVsv (&PL_sv_undef);	1038	return newSVsv (&PL_sv_undef);
		1039	case 23:
		1040	#if CBOR_SLOW
		1041	types_error = get_bool ("Types::Serialiser::error");
		1042	#endif
		1043	return newSVsv (types_error);
662		1044
663	case 25:	1045	case 25:
664	{	1046	{
665	WANT (2);	1047	WANT (2);
666		1048
…		…
710	}	1092	}
711		1093
712	static SV *	1094	static SV *
713	decode_cbor (SV string, CBOR cbor, char **offset_return)	1095	decode_cbor (SV string, CBOR cbor, char **offset_return)
714	{	1096	{
715	dec_t dec;	1097	dec_t dec = { };
716	SV *sv;	1098	SV *sv;
		1099	STRLEN len;
		1100	char *data = SvPVbyte (string, len);
717		1101
718	/* work around bugs in 5.10 where manipulating magic values
719	* makes perl ignore the magic in subsequent accesses.
720	* also make a copy of non-PV values, to get them into a clean
721	* state (SvPV should do that, but it's buggy, see below).
722	*/
723	/SvGETMAGIC (string);/
724	if (SvMAGICAL (string) \|\| !SvPOK (string))
725	string = sv_2mortal (newSVsv (string));
726
727	SvUPGRADE (string, SVt_PV);
728
729	/* work around a bug in perl 5.10, which causes SvCUR to fail an
730	* assertion with -DDEBUGGING, although SvCUR is documented to
731	* return the xpv_cur field which certainly exists after upgrading.
732	* according to nicholas clark, calling SvPOK fixes this.
733	* But it doesn't fix it, so try another workaround, call SvPV_nolen
734	* and hope for the best.
735	* Damnit, SvPV_nolen still trips over yet another assertion. This
736	* assertion business is seriously broken, try yet another workaround
737	* for the broken -DDEBUGGING.
738	*/
739	{
740	#ifdef DEBUGGING
741	STRLEN offset = SvOK (string) ? sv_len (string) : 0;
742	#else
743	STRLEN offset = SvCUR (string);
744	#endif
745
746	if (offset > cbor->max_size && cbor->max_size)	1102	if (len > cbor->max_size && cbor->max_size)
747	croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",	1103	croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",
748	(unsigned long)SvCUR (string), (unsigned long)cbor->max_size);	1104	(unsigned long)len, (unsigned long)cbor->max_size);
749	}
750
751	sv_utf8_downgrade (string, 0);
752		1105
753	dec.cbor = *cbor;	1106	dec.cbor = *cbor;
754	dec.cur = (U8 *)SvPVX (string);	1107	dec.cur = (U8 *)data;
755	dec.end = (U8 *)SvEND (string);	1108	dec.end = (U8 *)data + len;
756	dec.err = 0;
757	dec.depth = 0;
758		1109
759	sv = decode_sv (&dec);	1110	sv = decode_sv (&dec);
760		1111
761	if (offset_return)	1112	if (offset_return)
762	*offset_return = dec.cur;	1113	*offset_return = dec.cur;
…		…
766	dec.err = "garbage after CBOR object";	1117	dec.err = "garbage after CBOR object";
767		1118
768	if (dec.err)	1119	if (dec.err)
769	{	1120	{
770	SvREFCNT_dec (sv);	1121	SvREFCNT_dec (sv);
771	croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 )SvPVX (string), (int)(uint8_t)dec.cur);	1122	croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 )data, (int)(uint8_t)dec.cur);
772	}	1123	}
773		1124
774	sv = sv_2mortal (sv);	1125	sv = sv_2mortal (sv);
775		1126
776	return sv;	1127	return sv;
…		…
782	MODULE = CBOR::XS PACKAGE = CBOR::XS	1133	MODULE = CBOR::XS PACKAGE = CBOR::XS
783		1134
784	BOOT:	1135	BOOT:
785	{	1136	{
786	cbor_stash = gv_stashpv ("CBOR::XS" , 1);	1137	cbor_stash = gv_stashpv ("CBOR::XS" , 1);
787	cbor_boolean_stash = gv_stashpv ("CBOR::XS::Boolean", 1);
788	cbor_tagged_stash = gv_stashpv ("CBOR::XS::Tagged" , 1);	1138	cbor_tagged_stash = gv_stashpv ("CBOR::XS::Tagged" , 1);
789		1139
790	cbor_true = get_bool ("CBOR::XS::true");	1140	types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
791	cbor_false = get_bool ("CBOR::XS::false");	1141	types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);
		1142
		1143	types_true = get_bool ("Types::Serialiser::true" );
		1144	types_false = get_bool ("Types::Serialiser::false");
		1145	types_error = get_bool ("Types::Serialiser::error");
		1146
		1147	default_filter = newSVpv ("CBOR::XS::default_filter", 0);
		1148
		1149	sv_cbor = newSVpv ("CBOR", 0);
		1150	SvREADONLY_on (sv_cbor);
792	}	1151	}
793		1152
794	PROTOTYPES: DISABLE	1153	PROTOTYPES: DISABLE
795		1154
796	void CLONE (...)	1155	void CLONE (...)
797	CODE:	1156	CODE:
798	cbor_stash = 0;	1157	cbor_stash = 0;
799	cbor_boolean_stash = 0;
800	cbor_tagged_stash = 0;	1158	cbor_tagged_stash = 0;
		1159	types_error_stash = 0;
		1160	types_boolean_stash = 0;
801		1161
802	void new (char *klass)	1162	void new (char *klass)
803	PPCODE:	1163	PPCODE:
804	{	1164	{
805	SV *pv = NEWSV (0, sizeof (CBOR));	1165	SV *pv = NEWSV (0, sizeof (CBOR));
…		…
813		1173
814	void shrink (CBOR *self, int enable = 1)	1174	void shrink (CBOR *self, int enable = 1)
815	ALIAS:	1175	ALIAS:
816	shrink = F_SHRINK	1176	shrink = F_SHRINK
817	allow_unknown = F_ALLOW_UNKNOWN	1177	allow_unknown = F_ALLOW_UNKNOWN
		1178	allow_sharing = F_ALLOW_SHARING
		1179	pack_strings = F_PACK_STRINGS
818	PPCODE:	1180	PPCODE:
819	{	1181	{
820	if (enable)	1182	if (enable)
821	self->flags \|= ix;	1183	self->flags \|= ix;
822	else	1184	else
…		…
827		1189
828	void get_shrink (CBOR *self)	1190	void get_shrink (CBOR *self)
829	ALIAS:	1191	ALIAS:
830	get_shrink = F_SHRINK	1192	get_shrink = F_SHRINK
831	get_allow_unknown = F_ALLOW_UNKNOWN	1193	get_allow_unknown = F_ALLOW_UNKNOWN
		1194	get_allow_sharing = F_ALLOW_SHARING
		1195	get_pack_strings = F_PACK_STRINGS
832	PPCODE:	1196	PPCODE:
833	XPUSHs (boolSV (self->flags & ix));	1197	XPUSHs (boolSV (self->flags & ix));
834		1198
835	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)	1199	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
836	PPCODE:	1200	PPCODE:
…		…
852	CODE:	1216	CODE:
853	RETVAL = self->max_size;	1217	RETVAL = self->max_size;
854	OUTPUT:	1218	OUTPUT:
855	RETVAL	1219	RETVAL
856		1220
857	#if 0 //TODO	1221	void filter (CBOR self, SV filter = 0)
858
859	void filter_cbor_object (CBOR self, SV cb = &PL_sv_undef)
860	PPCODE:	1222	PPCODE:
861	{
862	SvREFCNT_dec (self->cb_object);	1223	SvREFCNT_dec (self->filter);
863	self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;	1224	self->filter = filter ? newSVsv (filter) : filter;
864
865	XPUSHs (ST (0));	1225	XPUSHs (ST (0));
866	}
867		1226
868	void filter_cbor_single_key_object (CBOR self, SV key, SV *cb = &PL_sv_undef)	1227	SV get_filter (CBOR self)
869	PPCODE:	1228	CODE:
870	{	1229	RETVAL = self->filter ? self->filter : NEWSV (0, 0);
871	if (!self->cb_sk_object)	1230	OUTPUT:
872	self->cb_sk_object = newHV ();	1231	RETVAL
873
874	if (SvOK (cb))
875	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
876	else
877	{
878	hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
879
880	if (!HvKEYS (self->cb_sk_object))
881	{
882	SvREFCNT_dec (self->cb_sk_object);
883	self->cb_sk_object = 0;
884	}
885	}
886
887	XPUSHs (ST (0));
888	}
889
890	#endif
891		1232
892	void encode (CBOR self, SV scalar)	1233	void encode (CBOR self, SV scalar)
893	PPCODE:	1234	PPCODE:
894	PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;	1235	PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;
895	XPUSHs (scalar);	1236	XPUSHs (scalar);
…		…
908	EXTEND (SP, 2);	1249	EXTEND (SP, 2);
909	PUSHs (sv);	1250	PUSHs (sv);
910	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));	1251	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
911	}	1252	}
912		1253
913	#if 0
914
915	void DESTROY (CBOR *self)	1254	void DESTROY (CBOR *self)
916	CODE:	1255	PPCODE:
917	SvREFCNT_dec (self->cb_sk_object);	1256	cbor_free (self);
918	SvREFCNT_dec (self->cb_object);
919
920	#endif
921		1257
922	PROTOTYPES: ENABLE	1258	PROTOTYPES: ENABLE
923		1259
924	void encode_cbor (SV *scalar)	1260	void encode_cbor (SV *scalar)
925	PPCODE:	1261	PPCODE:

Diff Legend

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

Comparing CBOR-XS/XS.xs (file contents): Revision 1.6 by root, Sat Oct 26 22:25:47 2013 UTC vs. Revision 1.34 by root, Sat Nov 30 16:19:59 2013 UTC

Diff Legend

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.6 by root, Sat Oct 26 22:25:47 2013 UTC vs.
Revision 1.34 by root, Sat Nov 30 16:19:59 2013 UTC