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

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.9 by root, Sun Oct 27 10:17:12 2013 UTC vs.
Revision 1.29 by root, Thu Nov 28 09:13:12 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
14	// known tags	28	// known tags
15	enum cbor_tag	29	enum cbor_tag
16	{	30	{
17	// inofficial extensions (pending iana registration)	31	// extensions
18	CBOR_TAG_PERL_OBJECT = 256,	32	CBOR_TAG_STRINGREF = 25, // http://cbor.schmorp.de/stringref
19	CBOR_TAG_GENERIC_OBJECT = 257,	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
20		39
21	// rfc7049	40	// rfc7049
22	CBOR_TAG_DATETIME = 0, // rfc4287, utf-8	41	CBOR_TAG_DATETIME = 0, // rfc4287, utf-8
23	CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any	42	CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any
24	CBOR_TAG_POS_BIGNUM = 2, // byte string	43	CBOR_TAG_POS_BIGNUM = 2, // byte string
…		…
38	CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8	57	CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
39		58
40	CBOR_TAG_MAGIC = 55799 // self-describe cbor	59	CBOR_TAG_MAGIC = 55799 // self-describe cbor
41	};	60	};
42		61
43	#define F_SHRINK 0x00000200UL	62	#define F_SHRINK 0x00000001UL
44	#define F_ALLOW_UNKNOWN 0x00002000UL	63	#define F_ALLOW_UNKNOWN 0x00000002UL
		64	#define F_ALLOW_SHARING 0x00000004UL //TODO
		65	#define F_ALLOW_STRINGREF 0x00000008UL //TODO
45		66
46	#define INIT_SIZE 32 // initial scalar size to be allocated	67	#define INIT_SIZE 32 // initial scalar size to be allocated
47		68
48	#define SB do {	69	#define SB do {
49	#define SE } while (0)	70	#define SE } while (0)
…		…
60	#else	81	#else
61	# define CBOR_SLOW 0	82	# define CBOR_SLOW 0
62	# define CBOR_STASH cbor_stash	83	# define CBOR_STASH cbor_stash
63	#endif	84	#endif
64		85
65	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::
66	static SV cbor_true, cbor_false;	87	static SV types_true, types_false, types_error, sv_cbor, *default_filter;
67		88
68	typedef struct {	89	typedef struct {
69	U32 flags;	90	U32 flags;
70	U32 max_depth;	91	U32 max_depth;
71	STRLEN max_size;	92	STRLEN max_size;
		93	SV *filter;
72	} CBOR;	94	} CBOR;
73		95
74	ecb_inline void	96	ecb_inline void
75	cbor_init (CBOR *cbor)	97	cbor_init (CBOR *cbor)
76	{	98	{
77	Zero (cbor, 1, CBOR);	99	Zero (cbor, 1, CBOR);
78	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);
79	}	107	}
80		108
81	/////////////////////////////////////////////////////////////////////////////	109	/////////////////////////////////////////////////////////////////////////////
82	// utility functions	110	// utility functions
83		111
…		…
105	SvPV_renew (sv, SvCUR (sv) + 1);	133	SvPV_renew (sv, SvCUR (sv) + 1);
106	#endif	134	#endif
107	}	135	}
108	}	136	}
109		137
110	/////////////////////////////////////////////////////////////////////////////	138	// minimum length of a string to be registered for stringref
111	// fp hell	139	ecb_inline int
112		140	minimum_string_length (UV idx)
113	//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	}
114		152
115	/////////////////////////////////////////////////////////////////////////////	153	/////////////////////////////////////////////////////////////////////////////
116	// encoder	154	// encoder
117		155
118	// structure used for encoding CBOR	156	// structure used for encoding CBOR
…		…
121	char *cur; // SvPVX (sv) + current output position	159	char *cur; // SvPVX (sv) + current output position
122	char *end; // SvEND (sv)	160	char *end; // SvEND (sv)
123	SV *sv; // result scalar	161	SV *sv; // result scalar
124	CBOR cbor;	162	CBOR cbor;
125	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;
126	} enc_t;	168	} enc_t;
127		169
128	ecb_inline void	170	ecb_inline void
129	need (enc_t *enc, STRLEN len)	171	need (enc_t *enc, STRLEN len)
130	{	172	{
…		…
182	*enc->cur++ = len >> 8;	224	*enc->cur++ = len >> 8;
183	*enc->cur++ = len;	225	*enc->cur++ = len;
184	}	226	}
185	}	227	}
186		228
		229	ecb_inline void
		230	encode_tag (enc_t *enc, UV tag)
		231	{
		232	encode_uint (enc, 0xc0, tag);
		233	}
		234
187	static void	235	static void
188	encode_str (enc_t enc, int utf8, char str, STRLEN len)	236	encode_str (enc_t enc, int utf8, char str, STRLEN len)
189	{	237	{
		238	if (ecb_expect_false (enc->cbor.flags & F_ALLOW_STRINGREF))
		239	{
		240	SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);
		241
		242	if (SvOK (*svp))
		243	{
		244	// already registered, use stringref
		245	encode_tag (enc, CBOR_TAG_STRINGREF);
		246	encode_uint (enc, 0x00, SvUV (*svp));
		247	return;
		248	}
		249	else if (len >= minimum_string_length (enc->stringref_idx))
		250	{
		251	// register only
		252	sv_setuv (*svp, enc->stringref_idx);
		253	++enc->stringref_idx;
		254	}
		255	}
		256
190	encode_uint (enc, utf8 ? 0x60 : 0x40, len);	257	encode_uint (enc, utf8 ? 0x60 : 0x40, len);
191	need (enc, len);	258	need (enc, len);
192	memcpy (enc->cur, str, len);	259	memcpy (enc->cur, str, len);
193	enc->cur += len;	260	enc->cur += len;
194	}	261	}
…		…
252		319
253	// encode objects, arrays and special \0=false and \1=true values.	320	// encode objects, arrays and special \0=false and \1=true values.
254	static void	321	static void
255	encode_rv (enc_t enc, SV sv)	322	encode_rv (enc_t enc, SV sv)
256	{	323	{
257	svtype svt;
258
259	SvGETMAGIC (sv);	324	SvGETMAGIC (sv);
		325
		326	if (ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)
		327	&& ecb_expect_false (SvREFCNT (sv) > 1))
		328	{
		329	if (!enc->shareable)
		330	enc->shareable = (HV )sv_2mortal ((SV )newHV ());
		331
		332	SV *svp = hv_fetch (enc->shareable, (char )&sv, sizeof (sv), 1);
		333
		334	if (SvOK (*svp))
		335	{
		336	encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
		337	encode_uint (enc, 0x00, SvUV (*svp));
		338	return;
		339	}
		340	else
		341	{
		342	sv_setuv (*svp, enc->shareable_idx);
		343	++enc->shareable_idx;
		344	encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
		345	}
		346	}
		347
260	svt = SvTYPE (sv);	348	svtype svt = SvTYPE (sv);
261		349
262	if (ecb_expect_false (SvOBJECT (sv)))	350	if (ecb_expect_false (SvOBJECT (sv)))
263	{	351	{
264	HV *boolean_stash = !CBOR_SLOW \|\| cbor_boolean_stash	352	HV *boolean_stash = !CBOR_SLOW \|\| types_boolean_stash
265	? cbor_boolean_stash	353	? types_boolean_stash
266	: gv_stashpv ("CBOR::XS::Boolean", 1);	354	: gv_stashpv ("Types::Serialiser::Boolean", 1);
		355	HV *error_stash = !CBOR_SLOW \|\| types_error_stash
		356	? types_error_stash
		357	: gv_stashpv ("Types::Serialiser::Error", 1);
267	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash	358	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
268	? cbor_tagged_stash	359	? cbor_tagged_stash
269	: gv_stashpv ("CBOR::XS::Tagged" , 1);	360	: gv_stashpv ("CBOR::XS::Tagged" , 1);
270		361
		362	HV *stash = SvSTASH (sv);
		363	GV *method;
		364
271	if (SvSTASH (sv) == boolean_stash)	365	if (stash == boolean_stash)
272	encode_ch (enc, SvIV (sv) ? 0xe0 \| 21 : 0xe0 \| 20);	366	encode_ch (enc, SvIV (sv) ? 0xe0 \| 21 : 0xe0 \| 20);
		367	else if (stash == error_stash)
		368	encode_ch (enc, 0xe0 \| 23);
273	else if (SvSTASH (sv) == tagged_stash)	369	else if (stash == tagged_stash)
274	{	370	{
275	if (svt != SVt_PVAV)	371	if (svt != SVt_PVAV)
276	croak ("encountered CBOR::XS::Tagged object that isn't an array");	372	croak ("encountered CBOR::XS::Tagged object that isn't an array");
277		373
278	encode_uint (enc, 0xc0, SvUV (av_fetch ((AV )sv, 0, 1)));	374	encode_uint (enc, 0xc0, SvUV (av_fetch ((AV )sv, 0, 1)));
279	encode_sv (enc, av_fetch ((AV )sv, 1, 1));	375	encode_sv (enc, av_fetch ((AV )sv, 1, 1));
280	}	376	}
		377	else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
		378	{
		379	dSP;
		380
		381	ENTER; SAVETMPS; PUSHMARK (SP);
		382	// we re-bless the reference to get overload and other niceties right
		383	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		384
		385	PUTBACK;
		386	// G_SCALAR ensures that return value is 1
		387	call_sv ((SV *)GvCV (method), G_SCALAR);
		388	SPAGAIN;
		389
		390	// catch this surprisingly common error
		391	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		392	croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (stash));
		393
		394	encode_sv (enc, POPs);
		395
		396	PUTBACK;
		397
		398	FREETMPS; LEAVE;
		399	}
		400	else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
		401	{
		402	dSP;
		403
		404	ENTER; SAVETMPS; PUSHMARK (SP);
		405	EXTEND (SP, 2);
		406	// we re-bless the reference to get overload and other niceties right
		407	PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		408	PUSHs (sv_cbor);
		409
		410	PUTBACK;
		411	int count = call_sv ((SV *)GvCV (method), G_ARRAY);
		412	SPAGAIN;
		413
		414	// catch this surprisingly common error
		415	if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
		416	croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
		417
		418	encode_tag (enc, CBOR_TAG_PERL_OBJECT);
		419	encode_uint (enc, 0x80, count + 1);
		420	encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
		421
		422	while (count)
		423	encode_sv (enc, SP[1 - count--]);
		424
		425	PUTBACK;
		426
		427	FREETMPS; LEAVE;
		428	}
281	else	429	else
282	{
283	// we re-bless the reference to get overload and other niceties right
284	GV *to_cbor = gv_fetchmethod_autoload (SvSTASH (sv), "TO_CBOR", 0);
285
286	if (to_cbor)
287	{
288	dSP;
289
290	ENTER; SAVETMPS; PUSHMARK (SP);
291	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
292
293	// calling with G_SCALAR ensures that we always get a 1 return value
294	PUTBACK;
295	call_sv ((SV *)GvCV (to_cbor), G_SCALAR);
296	SPAGAIN;
297
298	// catch this surprisingly common error
299	if (SvROK (TOPs) && SvRV (TOPs) == sv)
300	croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
301
302	sv = POPs;
303	PUTBACK;
304
305	encode_sv (enc, sv);
306
307	FREETMPS; LEAVE;
308	}
309	else
310	croak ("encountered object '%s', but no TO_CBOR method available on it",	430	croak ("encountered object '%s', but no TO_CBOR or FREEZE methods available on it",
311	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	431	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
312	}
313	}	432	}
314	else if (svt == SVt_PVHV)	433	else if (svt == SVt_PVHV)
315	encode_hv (enc, (HV *)sv);	434	encode_hv (enc, (HV *)sv);
316	else if (svt == SVt_PVAV)	435	else if (svt == SVt_PVAV)
317	encode_av (enc, (AV *)sv);	436	encode_av (enc, (AV *)sv);
318	else if (svt < SVt_PVAV)
319	{
320	STRLEN len = 0;
321	char *pv = svt ? SvPV (sv, len) : 0;
322
323	if (len == 1 && *pv == '1')
324	encode_ch (enc, 0xe0 \| 21);
325	else if (len == 1 && *pv == '0')
326	encode_ch (enc, 0xe0 \| 20);
327	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
328	encode_ch (enc, 0xe0 \| 23);
329	else
330	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
331	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
332	}
333	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
334	encode_ch (enc, 0xe0 \| 23);
335	else	437	else
336	croak ("encountered %s, but CBOR can only represent references to arrays or hashes",	438	{
337	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	439	encode_tag (enc, CBOR_TAG_INDIRECTION);
		440	encode_sv (enc, sv);
		441	}
338	}	442	}
339		443
340	static void	444	static void
341	encode_nv (enc_t enc, SV sv)	445	encode_nv (enc_t enc, SV sv)
342	{	446	{
…		…
407	}	511	}
408		512
409	static SV *	513	static SV *
410	encode_cbor (SV scalar, CBOR cbor)	514	encode_cbor (SV scalar, CBOR cbor)
411	{	515	{
412	enc_t enc;	516	enc_t enc = { };
413		517
414	enc.cbor = *cbor;	518	enc.cbor = *cbor;
415	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	519	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
416	enc.cur = SvPVX (enc.sv);	520	enc.cur = SvPVX (enc.sv);
417	enc.end = SvEND (enc.sv);	521	enc.end = SvEND (enc.sv);
418	enc.depth = 0;
419		522
420	SvPOK_only (enc.sv);	523	SvPOK_only (enc.sv);
		524
		525	if (cbor->flags & F_ALLOW_STRINGREF)
		526	{
		527	encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE);
		528	enc.stringref[0]= (HV )sv_2mortal ((SV )newHV ());
		529	enc.stringref[1]= (HV )sv_2mortal ((SV )newHV ());
		530	}
		531
421	encode_sv (&enc, scalar);	532	encode_sv (&enc, scalar);
422		533
423	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	534	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
424	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	535	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
425		536
…		…
439	U8 *end; // end of input string	550	U8 *end; // end of input string
440	const char *err; // parse error, if != 0	551	const char *err; // parse error, if != 0
441	CBOR cbor;	552	CBOR cbor;
442	U32 depth; // recursion depth	553	U32 depth; // recursion depth
443	U32 maxdepth; // recursion depth limit	554	U32 maxdepth; // recursion depth limit
		555	AV *shareable;
		556	AV *stringref;
		557	SV *decode_tagged;
444	} dec_t;	558	} dec_t;
445		559
446	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE	560	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE
447		561
448	#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")	562	#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")
…		…
542	SvREFCNT_dec (av);	656	SvREFCNT_dec (av);
543	DEC_DEC_DEPTH;	657	DEC_DEC_DEPTH;
544	return &PL_sv_undef;	658	return &PL_sv_undef;
545	}	659	}
546		660
		661	static void
		662	decode_he (dec_t dec, HV hv)
		663	{
		664	// for speed reasons, we specialcase single-string
		665	// byte or utf-8 strings as keys, but only when !stringref
		666
		667	if (ecb_expect_true (!dec->stringref))
		668	if (dec->cur >= 0x40 && dec->cur <= 0x40 + 27)
		669	{
		670	I32 len = decode_uint (dec);
		671	char key = (char )dec->cur;
		672
		673	dec->cur += len;
		674
		675	if (ecb_expect_false (dec->stringref))
		676	av_push (dec->stringref, newSVpvn (key, len));
		677
		678	hv_store (hv, key, len, decode_sv (dec), 0);
		679
		680	return;
		681	}
		682	else if (dec->cur >= 0x60 && dec->cur <= 0x60 + 27)
		683	{
		684	I32 len = decode_uint (dec);
		685	char key = (char )dec->cur;
		686
		687	dec->cur += len;
		688
		689	if (ecb_expect_false (dec->stringref))
		690	av_push (dec->stringref, newSVpvn_utf8 (key, len, 1));
		691
		692	hv_store (hv, key, -len, decode_sv (dec), 0);
		693
		694	return;
		695	}
		696
		697	SV *k = decode_sv (dec);
		698	SV *v = decode_sv (dec);
		699
		700	hv_store_ent (hv, k, v, 0);
		701	SvREFCNT_dec (k);
		702	}
		703
547	static SV *	704	static SV *
548	decode_hv (dec_t *dec)	705	decode_hv (dec_t *dec)
549	{	706	{
550	HV *hv = newHV ();	707	HV *hv = newHV ();
551		708
…		…
563	{	720	{
564	++dec->cur;	721	++dec->cur;
565	break;	722	break;
566	}	723	}
567		724
568	SV *k = decode_sv (dec);	725	decode_he (dec, hv);
569	SV *v = decode_sv (dec);
570
571	hv_store_ent (hv, k, v, 0);
572	}	726	}
573	}	727	}
574	else	728	else
575	{	729	{
576	int len = decode_uint (dec);	730	int pairs = decode_uint (dec);
577		731
578	while (len--)	732	while (pairs--)
579	{	733	decode_he (dec, hv);
580	SV *k = decode_sv (dec);
581	SV *v = decode_sv (dec);
582
583	hv_store_ent (hv, k, v, 0);
584	}
585	}	734	}
586		735
587	DEC_DEC_DEPTH;	736	DEC_DEC_DEPTH;
588	return newRV_noinc ((SV *)hv);	737	return newRV_noinc ((SV *)hv);
589		738
…		…
623	STRLEN len = decode_uint (dec);	772	STRLEN len = decode_uint (dec);
624		773
625	WANT (len);	774	WANT (len);
626	sv = newSVpvn (dec->cur, len);	775	sv = newSVpvn (dec->cur, len);
627	dec->cur += len;	776	dec->cur += len;
		777
		778	if (ecb_expect_false (dec->stringref)
		779	&& SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1))
		780	av_push (dec->stringref, SvREFCNT_inc_NN (sv));
628	}	781	}
629		782
630	if (utf8)	783	if (utf8)
631	SvUTF8_on (sv);	784	SvUTF8_on (sv);
632		785
…		…
638	}	791	}
639		792
640	static SV *	793	static SV *
641	decode_tagged (dec_t *dec)	794	decode_tagged (dec_t *dec)
642	{	795	{
		796	SV *sv = 0;
643	UV tag = decode_uint (dec);	797	UV tag = decode_uint (dec);
		798
		799	WANT (1);
		800
		801	switch (tag)
		802	{
		803	case CBOR_TAG_MAGIC:
		804	sv = decode_sv (dec);
		805	break;
		806
		807	case CBOR_TAG_INDIRECTION:
		808	sv = newRV_noinc (decode_sv (dec));
		809	break;
		810
		811	case CBOR_TAG_STRINGREF_NAMESPACE:
		812	{
		813	ENTER; SAVETMPS;
		814
		815	SAVESPTR (dec->stringref);
		816	dec->stringref = (AV )sv_2mortal ((SV )newAV ());
		817
		818	sv = decode_sv (dec);
		819
		820	FREETMPS; LEAVE;
		821	}
		822	break;
		823
		824	case CBOR_TAG_STRINGREF:
		825	{
		826	if ((*dec->cur >> 5) != 0)
		827	ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
		828
		829	UV idx = decode_uint (dec);
		830
		831	if (!dec->stringref \|\| (int)idx > AvFILLp (dec->stringref))
		832	ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)");
		833
		834	sv = newSVsv (AvARRAY (dec->stringref)[idx]);
		835	}
		836	break;
		837
		838	case CBOR_TAG_VALUE_SHAREABLE:
		839	{
		840	if (ecb_expect_false (!dec->shareable))
		841	dec->shareable = (AV )sv_2mortal ((SV )newAV ());
		842
		843	sv = newSV (0);
		844	av_push (dec->shareable, SvREFCNT_inc_NN (sv));
		845
644	SV *sv = decode_sv (dec);	846	SV *osv = decode_sv (dec);
		847	sv_setsv (sv, osv);
		848	SvREFCNT_dec_NN (osv);
		849	}
		850	break;
645		851
646	if (tag == CBOR_TAG_MAGIC)	852	case CBOR_TAG_VALUE_SHAREDREF:
647	return sv;	853	{
		854	if ((*dec->cur >> 5) != 0)
		855	ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
648		856
649	if (tag == CBOR_TAG_PERL_OBJECT)	857	UV idx = decode_uint (dec);
650	{	858
		859	if (!dec->shareable \|\| (int)idx > AvFILLp (dec->shareable))
		860	ERR ("corrupted CBOR data (sharedref index out of bounds)");
		861
		862	sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
		863	}
		864	break;
		865
		866	case CBOR_TAG_PERL_OBJECT:
		867	{
		868	sv = decode_sv (dec);
		869
651	if (!SvROK (sv) \|\| SvTYPE (SvRV (sv)) != SVt_PVAV)	870	if (!SvROK (sv) \|\| SvTYPE (SvRV (sv)) != SVt_PVAV)
652	ERR ("corrupted CBOR data (non-array perl object)");	871	ERR ("corrupted CBOR data (non-array perl object)");
		872
		873	AV av = (AV )SvRV (sv);
		874	int len = av_len (av) + 1;
		875	HV stash = gv_stashsv (av_fetch (av, 0, 1), 0);
		876
		877	if (!stash)
		878	ERR ("cannot decode perl-object (package does not exist)");
		879
		880	GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
		881
		882	if (!method)
		883	ERR ("cannot decode perl-object (package does not have a THAW method)");
		884
		885	dSP;
		886
		887	ENTER; SAVETMPS; PUSHMARK (SP);
		888	EXTEND (SP, len + 1);
		889	// we re-bless the reference to get overload and other niceties right
		890	PUSHs (*av_fetch (av, 0, 1));
		891	PUSHs (sv_cbor);
		892
		893	int i;
		894
		895	for (i = 1; i < len; ++i)
		896	PUSHs (*av_fetch (av, i, 1));
		897
		898	PUTBACK;
		899	call_sv ((SV *)GvCV (method), G_SCALAR \| G_EVAL);
		900	SPAGAIN;
		901
		902	if (SvTRUE (ERRSV))
		903	{
		904	FREETMPS; LEAVE;
		905	ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
		906	}
		907
		908	SvREFCNT_dec (sv);
		909	sv = SvREFCNT_inc (POPs);
		910
		911	PUTBACK;
		912
		913	FREETMPS; LEAVE;
653		914	}
654	// TODO	915	break;
655	}
656		916
		917	default:
		918	{
		919	sv = decode_sv (dec);
		920
		921	dSP;
		922	ENTER; SAVETMPS; PUSHMARK (SP);
		923	EXTEND (SP, 2);
		924	PUSHs (newSVuv (tag));
		925	PUSHs (sv);
		926
		927	PUTBACK;
		928	int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY \| G_EVAL);
		929	SPAGAIN;
		930
		931	if (SvTRUE (ERRSV))
		932	{
		933	FREETMPS; LEAVE;
		934	ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
		935	}
		936
		937	if (count)
		938	{
		939	SvREFCNT_dec (sv);
		940	sv = SvREFCNT_inc (POPs);
		941	}
		942	else
		943	{
657	AV *av = newAV ();	944	AV *av = newAV ();
658	av_push (av, newSVuv (tag));	945	av_push (av, newSVuv (tag));
659	av_push (av, sv);	946	av_push (av, sv);
660		947
661	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash	948	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
662	? cbor_tagged_stash	949	? cbor_tagged_stash
663	: gv_stashpv ("CBOR::XS::Tagged" , 1);	950	: gv_stashpv ("CBOR::XS::Tagged" , 1);
664
665	return sv_bless (newRV_noinc ((SV *)av), tagged_stash);	951	sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash);
		952	}
		953
		954	PUTBACK;
		955
		956	FREETMPS; LEAVE;
		957	}
		958	break;
		959	}
		960
		961	return sv;
666		962
667	fail:	963	fail:
668	SvREFCNT_dec (sv);	964	SvREFCNT_dec (sv);
669	return &PL_sv_undef;	965	return &PL_sv_undef;
670	}	966	}
…		…
693	case 7: // misc	989	case 7: // misc
694	switch (*dec->cur++ & 31)	990	switch (*dec->cur++ & 31)
695	{	991	{
696	case 20:	992	case 20:
697	#if CBOR_SLOW	993	#if CBOR_SLOW
698	cbor_false = get_bool ("CBOR::XS::false");	994	types_false = get_bool ("Types::Serialiser::false");
699	#endif	995	#endif
700	return newSVsv (cbor_false);	996	return newSVsv (types_false);
701	case 21:	997	case 21:
702	#if CBOR_SLOW	998	#if CBOR_SLOW
703	cbor_true = get_bool ("CBOR::XS::true");	999	types_true = get_bool ("Types::Serialiser::true");
704	#endif	1000	#endif
705	return newSVsv (cbor_true);	1001	return newSVsv (types_true);
706	case 22:	1002	case 22:
707	return newSVsv (&PL_sv_undef);	1003	return newSVsv (&PL_sv_undef);
		1004	case 23:
		1005	#if CBOR_SLOW
		1006	types_error = get_bool ("Types::Serialiser::error");
		1007	#endif
		1008	return newSVsv (types_error);
708		1009
709	case 25:	1010	case 25:
710	{	1011	{
711	WANT (2);	1012	WANT (2);
712		1013
…		…
756	}	1057	}
757		1058
758	static SV *	1059	static SV *
759	decode_cbor (SV string, CBOR cbor, char **offset_return)	1060	decode_cbor (SV string, CBOR cbor, char **offset_return)
760	{	1061	{
761	dec_t dec;	1062	dec_t dec = { };
762	SV *sv;	1063	SV *sv;
		1064	STRLEN len;
		1065	char *data = SvPVbyte (string, len);
763		1066
764	/* work around bugs in 5.10 where manipulating magic values
765	* makes perl ignore the magic in subsequent accesses.
766	* also make a copy of non-PV values, to get them into a clean
767	* state (SvPV should do that, but it's buggy, see below).
768	*/
769	/SvGETMAGIC (string);/
770	if (SvMAGICAL (string) \|\| !SvPOK (string))
771	string = sv_2mortal (newSVsv (string));
772
773	SvUPGRADE (string, SVt_PV);
774
775	/* work around a bug in perl 5.10, which causes SvCUR to fail an
776	* assertion with -DDEBUGGING, although SvCUR is documented to
777	* return the xpv_cur field which certainly exists after upgrading.
778	* according to nicholas clark, calling SvPOK fixes this.
779	* But it doesn't fix it, so try another workaround, call SvPV_nolen
780	* and hope for the best.
781	* Damnit, SvPV_nolen still trips over yet another assertion. This
782	* assertion business is seriously broken, try yet another workaround
783	* for the broken -DDEBUGGING.
784	*/
785	{
786	#ifdef DEBUGGING
787	STRLEN offset = SvOK (string) ? sv_len (string) : 0;
788	#else
789	STRLEN offset = SvCUR (string);
790	#endif
791
792	if (offset > cbor->max_size && cbor->max_size)	1067	if (len > cbor->max_size && cbor->max_size)
793	croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",	1068	croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",
794	(unsigned long)SvCUR (string), (unsigned long)cbor->max_size);	1069	(unsigned long)len, (unsigned long)cbor->max_size);
795	}
796
797	sv_utf8_downgrade (string, 0);
798		1070
799	dec.cbor = *cbor;	1071	dec.cbor = *cbor;
800	dec.cur = (U8 *)SvPVX (string);	1072	dec.cur = (U8 *)data;
801	dec.end = (U8 *)SvEND (string);	1073	dec.end = (U8 *)data + len;
802	dec.err = 0;
803	dec.depth = 0;
804		1074
805	sv = decode_sv (&dec);	1075	sv = decode_sv (&dec);
806		1076
807	if (offset_return)	1077	if (offset_return)
808	*offset_return = dec.cur;	1078	*offset_return = dec.cur;
…		…
812	dec.err = "garbage after CBOR object";	1082	dec.err = "garbage after CBOR object";
813		1083
814	if (dec.err)	1084	if (dec.err)
815	{	1085	{
816	SvREFCNT_dec (sv);	1086	SvREFCNT_dec (sv);
817	croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 )SvPVX (string), (int)(uint8_t)dec.cur);	1087	croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 )data, (int)(uint8_t)dec.cur);
818	}	1088	}
819		1089
820	sv = sv_2mortal (sv);	1090	sv = sv_2mortal (sv);
821		1091
822	return sv;	1092	return sv;
…		…
828	MODULE = CBOR::XS PACKAGE = CBOR::XS	1098	MODULE = CBOR::XS PACKAGE = CBOR::XS
829		1099
830	BOOT:	1100	BOOT:
831	{	1101	{
832	cbor_stash = gv_stashpv ("CBOR::XS" , 1);	1102	cbor_stash = gv_stashpv ("CBOR::XS" , 1);
833	cbor_boolean_stash = gv_stashpv ("CBOR::XS::Boolean", 1);
834	cbor_tagged_stash = gv_stashpv ("CBOR::XS::Tagged" , 1);	1103	cbor_tagged_stash = gv_stashpv ("CBOR::XS::Tagged" , 1);
835		1104
836	cbor_true = get_bool ("CBOR::XS::true");	1105	types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
837	cbor_false = get_bool ("CBOR::XS::false");	1106	types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);
		1107
		1108	types_true = get_bool ("Types::Serialiser::true" );
		1109	types_false = get_bool ("Types::Serialiser::false");
		1110	types_error = get_bool ("Types::Serialiser::error");
		1111
		1112	default_filter = newSVpv ("CBOR::XS::default_filter", 0);
		1113
		1114	sv_cbor = newSVpv ("CBOR", 0);
		1115	SvREADONLY_on (sv_cbor);
838	}	1116	}
839		1117
840	PROTOTYPES: DISABLE	1118	PROTOTYPES: DISABLE
841		1119
842	void CLONE (...)	1120	void CLONE (...)
843	CODE:	1121	CODE:
844	cbor_stash = 0;	1122	cbor_stash = 0;
845	cbor_boolean_stash = 0;
846	cbor_tagged_stash = 0;	1123	cbor_tagged_stash = 0;
		1124	types_error_stash = 0;
		1125	types_boolean_stash = 0;
847		1126
848	void new (char *klass)	1127	void new (char *klass)
849	PPCODE:	1128	PPCODE:
850	{	1129	{
851	SV *pv = NEWSV (0, sizeof (CBOR));	1130	SV *pv = NEWSV (0, sizeof (CBOR));
…		…
859		1138
860	void shrink (CBOR *self, int enable = 1)	1139	void shrink (CBOR *self, int enable = 1)
861	ALIAS:	1140	ALIAS:
862	shrink = F_SHRINK	1141	shrink = F_SHRINK
863	allow_unknown = F_ALLOW_UNKNOWN	1142	allow_unknown = F_ALLOW_UNKNOWN
		1143	allow_sharing = F_ALLOW_SHARING
		1144	allow_stringref = F_ALLOW_STRINGREF
864	PPCODE:	1145	PPCODE:
865	{	1146	{
866	if (enable)	1147	if (enable)
867	self->flags \|= ix;	1148	self->flags \|= ix;
868	else	1149	else
…		…
873		1154
874	void get_shrink (CBOR *self)	1155	void get_shrink (CBOR *self)
875	ALIAS:	1156	ALIAS:
876	get_shrink = F_SHRINK	1157	get_shrink = F_SHRINK
877	get_allow_unknown = F_ALLOW_UNKNOWN	1158	get_allow_unknown = F_ALLOW_UNKNOWN
		1159	get_allow_sharing = F_ALLOW_SHARING
		1160	get_allow_stringref = F_ALLOW_STRINGREF
878	PPCODE:	1161	PPCODE:
879	XPUSHs (boolSV (self->flags & ix));	1162	XPUSHs (boolSV (self->flags & ix));
880		1163
881	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)	1164	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
882	PPCODE:	1165	PPCODE:
…		…
898	CODE:	1181	CODE:
899	RETVAL = self->max_size;	1182	RETVAL = self->max_size;
900	OUTPUT:	1183	OUTPUT:
901	RETVAL	1184	RETVAL
902		1185
903	#if 0 //TODO	1186	void filter (CBOR self, SV filter = 0)
904
905	void filter_cbor_object (CBOR self, SV cb = &PL_sv_undef)
906	PPCODE:	1187	PPCODE:
907	{
908	SvREFCNT_dec (self->cb_object);	1188	SvREFCNT_dec (self->filter);
909	self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;	1189	self->filter = filter ? newSVsv (filter) : filter;
910
911	XPUSHs (ST (0));	1190	XPUSHs (ST (0));
912	}
913		1191
914	void filter_cbor_single_key_object (CBOR self, SV key, SV *cb = &PL_sv_undef)	1192	SV get_filter (CBOR self)
915	PPCODE:	1193	CODE:
916	{	1194	RETVAL = self->filter ? self->filter : NEWSV (0, 0);
917	if (!self->cb_sk_object)	1195	OUTPUT:
918	self->cb_sk_object = newHV ();	1196	RETVAL
919
920	if (SvOK (cb))
921	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
922	else
923	{
924	hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
925
926	if (!HvKEYS (self->cb_sk_object))
927	{
928	SvREFCNT_dec (self->cb_sk_object);
929	self->cb_sk_object = 0;
930	}
931	}
932
933	XPUSHs (ST (0));
934	}
935
936	#endif
937		1197
938	void encode (CBOR self, SV scalar)	1198	void encode (CBOR self, SV scalar)
939	PPCODE:	1199	PPCODE:
940	PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;	1200	PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;
941	XPUSHs (scalar);	1201	XPUSHs (scalar);
…		…
954	EXTEND (SP, 2);	1214	EXTEND (SP, 2);
955	PUSHs (sv);	1215	PUSHs (sv);
956	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));	1216	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
957	}	1217	}
958		1218
959	#if 0
960
961	void DESTROY (CBOR *self)	1219	void DESTROY (CBOR *self)
962	CODE:	1220	PPCODE:
963	SvREFCNT_dec (self->cb_sk_object);	1221	cbor_free (self);
964	SvREFCNT_dec (self->cb_object);
965
966	#endif
967		1222
968	PROTOTYPES: ENABLE	1223	PROTOTYPES: ENABLE
969		1224
970	void encode_cbor (SV *scalar)	1225	void encode_cbor (SV *scalar)
971	PPCODE:	1226	PPCODE:

Diff Legend

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

Comparing CBOR-XS/XS.xs (file contents): Revision 1.9 by root, Sun Oct 27 10:17:12 2013 UTC vs. Revision 1.29 by root, Thu Nov 28 09:13:12 2013 UTC

Diff Legend

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.9 by root, Sun Oct 27 10:17:12 2013 UTC vs.
Revision 1.29 by root, Thu Nov 28 09:13:12 2013 UTC