ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/CBOR-XS/XS.xs

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.17 by root, Tue Oct 29 22:04:52 2013 UTC vs.
Revision 1.51 by root, Sun Apr 24 13:15:19 2016 UTC

…		…
7	#include <stdlib.h>	7	#include <stdlib.h>
8	#include <stdio.h>	8	#include <stdio.h>
9	#include <limits.h>	9	#include <limits.h>
10	#include <float.h>	10	#include <float.h>
11		11
		12	#define ECB_NO_THREADS 1
12	#include "ecb.h"	13	#include "ecb.h"
13		14
14	// compatibility with perl <5.18	15	// compatibility with perl <5.18
15	#ifndef HvNAMELEN_get	16	#ifndef HvNAMELEN_get
16	# define HvNAMELEN_get(hv) strlen (HvNAME (hv))	17	# define HvNAMELEN_get(hv) strlen (HvNAME (hv))
…		…
19	# define HvNAMELEN(hv) HvNAMELEN_get (hv)	20	# define HvNAMELEN(hv) HvNAMELEN_get (hv)
20	#endif	21	#endif
21	#ifndef HvNAMEUTF8	22	#ifndef HvNAMEUTF8
22	# define HvNAMEUTF8(hv) 0	23	# define HvNAMEUTF8(hv) 0
23	#endif	24	#endif
		25	#ifndef SvREFCNT_dec_NN
		26	# define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
		27	#endif
		28
		29	// known major and minor types
		30	enum cbor_type
		31	{
		32	MAJOR_SHIFT = 5,
		33	MINOR_MASK = 0x1f,
		34
		35	MAJOR_POS_INT = 0 << MAJOR_SHIFT,
		36	MAJOR_NEG_INT = 1 << MAJOR_SHIFT,
		37	MAJOR_BYTES = 2 << MAJOR_SHIFT,
		38	MAJOR_TEXT = 3 << MAJOR_SHIFT,
		39	MAJOR_ARRAY = 4 << MAJOR_SHIFT,
		40	MAJOR_MAP = 5 << MAJOR_SHIFT,
		41	MAJOR_TAG = 6 << MAJOR_SHIFT,
		42	MAJOR_MISC = 7 << MAJOR_SHIFT,
		43
		44	// INT/STRING/ARRAY/MAP subtypes
		45	LENGTH_EXT1 = 24,
		46	LENGTH_EXT2 = 25,
		47	LENGTH_EXT4 = 26,
		48	LENGTH_EXT8 = 27,
		49
		50	// SIMPLE types (effectively MISC subtypes)
		51	SIMPLE_FALSE = 20,
		52	SIMPLE_TRUE = 21,
		53	SIMPLE_NULL = 22,
		54	SIMPLE_UNDEF = 23,
		55
		56	// MISC subtype (unused)
		57	MISC_EXT1 = 24,
		58	MISC_FLOAT16 = 25,
		59	MISC_FLOAT32 = 26,
		60	MISC_FLOAT64 = 27,
		61
		62	// BYTES/TEXT/ARRAY/MAP
		63	MINOR_INDEF = 31,
		64	};
24		65
25	// known tags	66	// known tags
26	enum cbor_tag	67	enum cbor_tag
27	{	68	{
28	// inofficial extensions (pending iana registration)	69	// extensions
29	CBOR_TAG_PERL_OBJECT = 256,	70	CBOR_TAG_STRINGREF = 25, // http://cbor.schmorp.de/stringref
30	CBOR_TAG_GENERIC_OBJECT = 257,	71	CBOR_TAG_PERL_OBJECT = 26, // http://cbor.schmorp.de/perl-object
		72	CBOR_TAG_GENERIC_OBJECT = 27, // http://cbor.schmorp.de/generic-object
		73	CBOR_TAG_VALUE_SHAREABLE = 28, // http://cbor.schmorp.de/value-sharing
		74	CBOR_TAG_VALUE_SHAREDREF = 29, // http://cbor.schmorp.de/value-sharing
		75	CBOR_TAG_STRINGREF_NAMESPACE = 256, // http://cbor.schmorp.de/stringref
		76	CBOR_TAG_INDIRECTION = 22098, // http://cbor.schmorp.de/indirection
31		77
32	// rfc7049	78	// rfc7049
33	CBOR_TAG_DATETIME = 0, // rfc4287, utf-8	79	CBOR_TAG_DATETIME = 0, // rfc4287, utf-8
34	CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any	80	CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any
35	CBOR_TAG_POS_BIGNUM = 2, // byte string	81	CBOR_TAG_POS_BIGNUM = 2, // byte string
36	CBOR_TAG_NEG_BIGNUM = 3, // byte string	82	CBOR_TAG_NEG_BIGNUM = 3, // byte string
37	CBOR_TAG_DECIMAL = 4, // decimal fraction, array	83	CBOR_TAG_DECIMAL = 4, // decimal fraction, array
38	CBOR_TAG_BIGFLOAT = 5, // array	84	CBOR_TAG_BIGFLOAT = 5, // array
39		85
40	CBOR_TAG_CONV_B64U = 21, // base64url, any	86	CBOR_TAG_CONV_B64U = 21, // base64url, any
41	CBOR_TAG_CONV_B64 = 22, // base64, any	87	CBOR_TAG_CONV_B64 = 22, // base64, any
42	CBOR_TAG_CONV_HEX = 23, // base16, any	88	CBOR_TAG_CONV_HEX = 23, // base16, any
43	CBOR_TAG_CBOR = 24, // embedded cbor, byte string	89	CBOR_TAG_CBOR = 24, // embedded cbor, byte string
44		90
45	CBOR_TAG_URI = 32, // URI rfc3986, utf-8	91	CBOR_TAG_URI = 32, // URI rfc3986, utf-8
46	CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8	92	CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8
47	CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8	93	CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8
48	CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8	94	CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8
49	CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8	95	CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
50		96
51	CBOR_TAG_MAGIC = 55799 // self-describe cbor	97	CBOR_TAG_MAGIC = 55799, // self-describe cbor
52	};	98	};
53		99
54	#define F_SHRINK 0x00000200UL	100	#define F_SHRINK 0x00000001UL
55	#define F_ALLOW_UNKNOWN 0x00002000UL	101	#define F_ALLOW_UNKNOWN 0x00000002UL
		102	#define F_ALLOW_SHARING 0x00000004UL
		103	#define F_ALLOW_CYCLES 0x00000008UL
		104	#define F_PACK_STRINGS 0x00000010UL
		105	#define F_UTF8_STRINGS 0x00000020UL
		106	#define F_VALIDATE_UTF8 0x00000040UL
56		107
57	#define INIT_SIZE 32 // initial scalar size to be allocated	108	#define INIT_SIZE 32 // initial scalar size to be allocated
58		109
59	#define SB do {	110	#define SB do {
60	#define SE } while (0)	111	#define SE } while (0)
…		…
72	# define CBOR_SLOW 0	123	# define CBOR_SLOW 0
73	# define CBOR_STASH cbor_stash	124	# define CBOR_STASH cbor_stash
74	#endif	125	#endif
75		126
76	static HV *cbor_stash, *types_boolean_stash, *types_error_stash, *cbor_tagged_stash; // CBOR::XS::	127	static HV *cbor_stash, *types_boolean_stash, *types_error_stash, *cbor_tagged_stash; // CBOR::XS::
77	static SV *types_true, *types_false, *types_error, *sv_cbor;	128	static SV *types_true, *types_false, *types_error, *sv_cbor, *default_filter;
78		129
79	typedef struct {	130	typedef struct {
80	U32 flags;	131	U32 flags;
81	U32 max_depth;	132	U32 max_depth;
82	STRLEN max_size;	133	STRLEN max_size;
		134	SV *filter;
		135
		136	// for the incremental parser
		137	STRLEN incr_pos; // the current offset into the text
		138	STRLEN incr_need; // minimum bytes needed to decode
		139	AV *incr_count; // for every nesting level, the number of outstanding values, or -1 for indef.
83	} CBOR;	140	} CBOR;
84		141
85	ecb_inline void	142	ecb_inline void
86	cbor_init (CBOR *cbor)	143	cbor_init (CBOR *cbor)
87	{	144	{
88	Zero (cbor, 1, CBOR);	145	Zero (cbor, 1, CBOR);
89	cbor->max_depth = 512;	146	cbor->max_depth = 512;
		147	}
		148
		149	ecb_inline void
		150	cbor_free (CBOR *cbor)
		151	{
		152	SvREFCNT_dec (cbor->filter);
		153	SvREFCNT_dec (cbor->incr_count);
90	}	154	}
91		155
92	/////////////////////////////////////////////////////////////////////////////	156	/////////////////////////////////////////////////////////////////////////////
93	// utility functions	157	// utility functions
94		158
…		…
116	SvPV_renew (sv, SvCUR (sv) + 1);	180	SvPV_renew (sv, SvCUR (sv) + 1);
117	#endif	181	#endif
118	}	182	}
119	}	183	}
120		184
121	/////////////////////////////////////////////////////////////////////////////	185	// minimum length of a string to be registered for stringref
122	// fp hell	186	ecb_inline int
123		187	minimum_string_length (UV idx)
124	//TODO	188	{
		189	return idx > 23
		190	? idx > 0xffU
		191	? idx > 0xffffU
		192	? idx > 0xffffffffU
		193	? 11
		194	: 7
		195	: 5
		196	: 4
		197	: 3;
		198	}
125		199
126	/////////////////////////////////////////////////////////////////////////////	200	/////////////////////////////////////////////////////////////////////////////
127	// encoder	201	// encoder
128		202
129	// structure used for encoding CBOR	203	// structure used for encoding CBOR
…		…
132	char *cur; // SvPVX (sv) + current output position	206	char *cur; // SvPVX (sv) + current output position
133	char *end; // SvEND (sv)	207	char *end; // SvEND (sv)
134	SV *sv; // result scalar	208	SV *sv; // result scalar
135	CBOR cbor;	209	CBOR cbor;
136	U32 depth; // recursion level	210	U32 depth; // recursion level
		211	HV *stringref[2]; // string => index, or 0 ([0] = bytes, [1] = utf-8)
		212	UV stringref_idx;
		213	HV *shareable; // ptr => index, or 0
		214	UV shareable_idx;
137	} enc_t;	215	} enc_t;
138		216
139	ecb_inline void	217	ecb_inline void
140	need (enc_t *enc, STRLEN len)	218	need (enc_t *enc, STRLEN len)
141	{	219	{
…		…
158	static void	236	static void
159	encode_uint (enc_t *enc, int major, UV len)	237	encode_uint (enc_t *enc, int major, UV len)
160	{	238	{
161	need (enc, 9);	239	need (enc, 9);
162		240
163	if (len < 24)	241	if (ecb_expect_true (len < LENGTH_EXT1))
164	*enc->cur++ = major | len;	242	*enc->cur++ = major | len;
165	else if (len <= 0xff)	243	else if (ecb_expect_true (len <= 0xffU))
166	{	244	{
167	*enc->cur++ = major | 24;	245	*enc->cur++ = major | LENGTH_EXT1;
168	*enc->cur++ = len;	246	*enc->cur++ = len;
169	}	247	}
170	else if (len <= 0xffff)	248	else if (len <= 0xffffU)
171	{	249	{
172	*enc->cur++ = major | 25;	250	*enc->cur++ = major | LENGTH_EXT2;
173	*enc->cur++ = len >> 8;	251	*enc->cur++ = len >> 8;
174	*enc->cur++ = len;	252	*enc->cur++ = len;
175	}	253	}
176	else if (len <= 0xffffffff)	254	else if (len <= 0xffffffffU)
177	{	255	{
178	*enc->cur++ = major | 26;	256	*enc->cur++ = major | LENGTH_EXT4;
179	*enc->cur++ = len >> 24;	257	*enc->cur++ = len >> 24;
180	*enc->cur++ = len >> 16;	258	*enc->cur++ = len >> 16;
181	*enc->cur++ = len >> 8;	259	*enc->cur++ = len >> 8;
182	*enc->cur++ = len;	260	*enc->cur++ = len;
183	}	261	}
184	else	262	else
185	{	263	{
186	*enc->cur++ = major | 27;	264	*enc->cur++ = major | LENGTH_EXT8;
187	*enc->cur++ = len >> 56;	265	*enc->cur++ = len >> 56;
188	*enc->cur++ = len >> 48;	266	*enc->cur++ = len >> 48;
189	*enc->cur++ = len >> 40;	267	*enc->cur++ = len >> 40;
190	*enc->cur++ = len >> 32;	268	*enc->cur++ = len >> 32;
191	*enc->cur++ = len >> 24;	269	*enc->cur++ = len >> 24;
…		…
193	*enc->cur++ = len >> 8;	271	*enc->cur++ = len >> 8;
194	*enc->cur++ = len;	272	*enc->cur++ = len;
195	}	273	}
196	}	274	}
197		275
198	static void	276	ecb_inline void
		277	encode_tag (enc_t *enc, UV tag)
		278	{
		279	encode_uint (enc, MAJOR_TAG, tag);
		280	}
		281
		282	ecb_inline void
199	encode_str (enc_t *enc, int utf8, char *str, STRLEN len)	283	encode_str (enc_t *enc, int utf8, char *str, STRLEN len)
200	{	284	{
201	encode_uint (enc, utf8 ? 0x60 : 0x40, len);	285	if (ecb_expect_false (enc->cbor.flags & F_UTF8_STRINGS))
		286	if (!utf8)
		287	{
		288	SV *sv = sv_newmortal ();
		289	char *s; STRLEN l;
		290
		291	sv_setpvn (sv, str, len);
		292
		293	s = SvPVutf8 (sv, l);
		294	encode_str (enc, 1, s, l);
		295	return;
		296	}
		297
		298	encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len);
202	need (enc, len);	299	need (enc, len);
203	memcpy (enc->cur, str, len);	300	memcpy (enc->cur, str, len);
204	enc->cur += len;	301	enc->cur += len;
205	}	302	}
206		303
		304	static void
		305	encode_strref (enc_t *enc, int utf8, char *str, STRLEN len)
		306	{
		307	if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS))
		308	{
		309	SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);
		310
		311	if (SvOK (*svp))
		312	{
		313	// already registered, use stringref
		314	encode_tag (enc, CBOR_TAG_STRINGREF);
		315	encode_uint (enc, MAJOR_POS_INT, SvUV (*svp));
		316	return;
		317	}
		318	else if (len >= minimum_string_length (enc->stringref_idx))
		319	{
		320	// register only
		321	sv_setuv (*svp, enc->stringref_idx);
		322	++enc->stringref_idx;
		323	}
		324	}
		325
		326	encode_str (enc, utf8, str, len);
		327	}
		328
207	static void encode_sv (enc_t *enc, SV *sv);	329	static void encode_sv (enc_t *enc, SV *sv);
208		330
209	static void	331	static void
210	encode_av (enc_t *enc, AV *av)	332	encode_av (enc_t *enc, AV *av)
211	{	333	{
…		…
214	if (enc->depth >= enc->cbor.max_depth)	336	if (enc->depth >= enc->cbor.max_depth)
215	croak (ERR_NESTING_EXCEEDED);	337	croak (ERR_NESTING_EXCEEDED);
216		338
217	++enc->depth;	339	++enc->depth;
218		340
219	encode_uint (enc, 0x80, len + 1);	341	encode_uint (enc, MAJOR_ARRAY, len + 1);
220		342
		343	if (SvMAGICAL (av))
221	for (i = 0; i <= len; ++i)	344	for (i = 0; i <= len; ++i)
222	{	345	{
223	SV **svp = av_fetch (av, i, 0);	346	SV **svp = av_fetch (av, i, 0);
224	encode_sv (enc, svp ? *svp : &PL_sv_undef);	347	encode_sv (enc, svp ? *svp : &PL_sv_undef);
225	}	348	}
		349	else
		350	for (i = 0; i <= len; ++i)
		351	{
		352	SV *sv = AvARRAY (av)[i];
		353	encode_sv (enc, sv ? sv : &PL_sv_undef);
		354	}
226		355
227	--enc->depth;	356	--enc->depth;
228	}	357	}
229		358
230	static void	359	static void
…		…
239		368
240	int pairs = hv_iterinit (hv);	369	int pairs = hv_iterinit (hv);
241	int mg = SvMAGICAL (hv);	370	int mg = SvMAGICAL (hv);
242		371
243	if (mg)	372	if (mg)
244	encode_ch (enc, 0xa0 | 31);	373	encode_ch (enc, MAJOR_MAP | MINOR_INDEF);
245	else	374	else
246	encode_uint (enc, 0xa0, pairs);	375	encode_uint (enc, MAJOR_MAP, pairs);
247		376
248	while ((he = hv_iternext (hv)))	377	while ((he = hv_iternext (hv)))
249	{	378	{
250	if (HeKLEN (he) == HEf_SVKEY)	379	if (HeKLEN (he) == HEf_SVKEY)
251	encode_sv (enc, HeSVKEY (he));	380	encode_sv (enc, HeSVKEY (he));
252	else	381	else
253	encode_str (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));	382	encode_strref (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));
254		383
255	encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));	384	encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));
256	}	385	}
257		386
258	if (mg)	387	if (mg)
259	encode_ch (enc, 0xe0 | 31);	388	encode_ch (enc, MAJOR_MISC | MINOR_INDEF);
260		389
261	--enc->depth;	390	--enc->depth;
262	}	391	}
263		392
264	// encode objects, arrays and special \0=false and \1=true values.	393	// encode objects, arrays and special \0=false and \1=true values.
265	static void	394	static void
266	encode_rv (enc_t *enc, SV *sv)	395	encode_rv (enc_t *enc, SV *sv)
267	{	396	{
268	svtype svt;
269
270	SvGETMAGIC (sv);	397	SvGETMAGIC (sv);
		398
271	svt = SvTYPE (sv);	399	svtype svt = SvTYPE (sv);
272		400
273	if (ecb_expect_false (SvOBJECT (sv)))	401	if (ecb_expect_false (SvOBJECT (sv)))
274	{	402	{
275	HV *boolean_stash = !CBOR_SLOW || types_boolean_stash	403	HV *boolean_stash = !CBOR_SLOW || types_boolean_stash
276	? types_boolean_stash	404	? types_boolean_stash
…		…
281	HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash	409	HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
282	? cbor_tagged_stash	410	? cbor_tagged_stash
283	: gv_stashpv ("CBOR::XS::Tagged" , 1);	411	: gv_stashpv ("CBOR::XS::Tagged" , 1);
284		412
285	HV *stash = SvSTASH (sv);	413	HV *stash = SvSTASH (sv);
286	GV *method;
287		414
288	if (stash == boolean_stash)	415	if (stash == boolean_stash)
289	encode_ch (enc, SvIV (sv) ? 0xe0 | 21 : 0xe0 | 20);	416	{
		417	encode_ch (enc, SvIV (sv) ? MAJOR_MISC | SIMPLE_TRUE : MAJOR_MISC | SIMPLE_FALSE);
		418	return;
		419	}
290	else if (stash == error_stash)	420	else if (stash == error_stash)
291	encode_ch (enc, 0xe0 | 23);	421	{
		422	encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF);
		423	return;
		424	}
292	else if (stash == tagged_stash)	425	else if (stash == tagged_stash)
293	{	426	{
294	if (svt != SVt_PVAV)	427	if (svt != SVt_PVAV)
295	croak ("encountered CBOR::XS::Tagged object that isn't an array");	428	croak ("encountered CBOR::XS::Tagged object that isn't an array");
296		429
297	encode_uint (enc, 0xc0, SvUV (*av_fetch ((AV *)sv, 0, 1)));	430	encode_uint (enc, MAJOR_TAG, SvUV (*av_fetch ((AV *)sv, 0, 1)));
298	encode_sv (enc, *av_fetch ((AV *)sv, 1, 1));	431	encode_sv (enc, *av_fetch ((AV *)sv, 1, 1));
		432
		433	return;
		434	}
		435	}
		436
		437	if (ecb_expect_false (SvREFCNT (sv) > 1)
		438	&& ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING))
		439	{
		440	if (!enc->shareable)
		441	enc->shareable = (HV *)sv_2mortal ((SV *)newHV ());
		442
		443	SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1);
		444
		445	if (SvOK (*svp))
299	}	446	{
		447	encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
		448	encode_uint (enc, MAJOR_POS_INT, SvUV (*svp));
		449	return;
		450	}
		451	else
		452	{
		453	sv_setuv (*svp, enc->shareable_idx);
		454	++enc->shareable_idx;
		455	encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
		456	}
		457	}
		458
		459	if (ecb_expect_false (SvOBJECT (sv)))
		460	{
		461	HV *stash = SvSTASH (sv);
		462	GV *method;
		463
300	else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))	464	if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
301	{	465	{
302	dSP;	466	dSP;
303		467
304	ENTER; SAVETMPS; PUSHMARK (SP);	468	ENTER; SAVETMPS;
		469	PUSHMARK (SP);
305	// we re-bless the reference to get overload and other niceties right	470	// we re-bless the reference to get overload and other niceties right
306	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));	471	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
307		472
308	PUTBACK;	473	PUTBACK;
309	// G_SCALAR ensures that return value is 1	474	// G_SCALAR ensures that return value is 1
…		…
322	}	487	}
323	else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)	488	else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
324	{	489	{
325	dSP;	490	dSP;
326		491
327	ENTER; SAVETMPS; PUSHMARK (SP);	492	ENTER; SAVETMPS;
		493	SAVESTACK_POS ();
		494	PUSHMARK (SP);
328	EXTEND (SP, 2);	495	EXTEND (SP, 2);
329	// we re-bless the reference to get overload and other niceties right	496	// we re-bless the reference to get overload and other niceties right
330	PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));	497	PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
331	PUSHs (sv_cbor);	498	PUSHs (sv_cbor);
332		499
…		…
336		503
337	// catch this surprisingly common error	504	// catch this surprisingly common error
338	if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)	505	if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
339	croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));	506	croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
340		507
341	encode_uint (enc, 0xc0, CBOR_TAG_PERL_OBJECT);	508	encode_tag (enc, CBOR_TAG_PERL_OBJECT);
342	encode_uint (enc, 0x80, count + 1);	509	encode_uint (enc, MAJOR_ARRAY, count + 1);
343	encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));	510	encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
344		511
345	while (count)	512	while (count)
346	encode_sv (enc, SP[1 - count--]);	513	encode_sv (enc, SP[1 - count--]);
347		514
348	PUTBACK;	515	PUTBACK;
…		…
355	}	522	}
356	else if (svt == SVt_PVHV)	523	else if (svt == SVt_PVHV)
357	encode_hv (enc, (HV *)sv);	524	encode_hv (enc, (HV *)sv);
358	else if (svt == SVt_PVAV)	525	else if (svt == SVt_PVAV)
359	encode_av (enc, (AV *)sv);	526	encode_av (enc, (AV *)sv);
360	else if (svt < SVt_PVAV)
361	{
362	STRLEN len = 0;
363	char *pv = svt ? SvPV (sv, len) : 0;
364
365	if (len == 1 && *pv == '1')
366	encode_ch (enc, 0xe0 | 21);
367	else if (len == 1 && *pv == '0')
368	encode_ch (enc, 0xe0 | 20);
369	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
370	encode_ch (enc, 0xe0 | 23);
371	else
372	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
373	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
374	}
375	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
376	encode_ch (enc, 0xe0 | 23);
377	else	527	else
378	croak ("encountered %s, but CBOR can only represent references to arrays or hashes",	528	{
379	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	529	encode_tag (enc, CBOR_TAG_INDIRECTION);
		530	encode_sv (enc, sv);
		531	}
380	}	532	}
381		533
382	static void	534	static void
383	encode_nv (enc_t *enc, SV *sv)	535	encode_nv (enc_t *enc, SV *sv)
384	{	536	{
385	double nv = SvNVX (sv);	537	double nv = SvNVX (sv);
386		538
387	need (enc, 9);	539	need (enc, 9);
388		540
389	if (ecb_expect_false (nv == (U32)nv))	541	if (ecb_expect_false (nv == (NV)(U32)nv))
390	encode_uint (enc, 0x00, (U32)nv);	542	encode_uint (enc, MAJOR_POS_INT, (U32)nv);
391	//TODO: maybe I32?	543	//TODO: maybe I32?
392	else if (ecb_expect_false (nv == (float)nv))	544	else if (ecb_expect_false (nv == (float)nv))
393	{	545	{
394	uint32_t fp = ecb_float_to_binary32 (nv);	546	uint32_t fp = ecb_float_to_binary32 (nv);
395		547
396	*enc->cur++ = 0xe0 | 26;	548	*enc->cur++ = MAJOR_MISC | MISC_FLOAT32;
397		549
398	if (!ecb_big_endian ())	550	if (!ecb_big_endian ())
399	fp = ecb_bswap32 (fp);	551	fp = ecb_bswap32 (fp);
400		552
401	memcpy (enc->cur, &fp, 4);	553	memcpy (enc->cur, &fp, 4);
…		…
403	}	555	}
404	else	556	else
405	{	557	{
406	uint64_t fp = ecb_double_to_binary64 (nv);	558	uint64_t fp = ecb_double_to_binary64 (nv);
407		559
408	*enc->cur++ = 0xe0 | 27;	560	*enc->cur++ = MAJOR_MISC | MISC_FLOAT64;
409		561
410	if (!ecb_big_endian ())	562	if (!ecb_big_endian ())
411	fp = ecb_bswap64 (fp);	563	fp = ecb_bswap64 (fp);
412		564
413	memcpy (enc->cur, &fp, 8);	565	memcpy (enc->cur, &fp, 8);
…		…
422		574
423	if (SvPOKp (sv))	575	if (SvPOKp (sv))
424	{	576	{
425	STRLEN len;	577	STRLEN len;
426	char *str = SvPV (sv, len);	578	char *str = SvPV (sv, len);
427	encode_str (enc, SvUTF8 (sv), str, len);	579	encode_strref (enc, SvUTF8 (sv), str, len);
428	}	580	}
429	else if (SvNOKp (sv))	581	else if (SvNOKp (sv))
430	encode_nv (enc, sv);	582	encode_nv (enc, sv);
431	else if (SvIOKp (sv))	583	else if (SvIOKp (sv))
432	{	584	{
433	if (SvIsUV (sv))	585	if (SvIsUV (sv))
434	encode_uint (enc, 0x00, SvUVX (sv));	586	encode_uint (enc, MAJOR_POS_INT, SvUVX (sv));
435	else if (SvIVX (sv) >= 0)	587	else if (SvIVX (sv) >= 0)
436	encode_uint (enc, 0x00, SvIVX (sv));	588	encode_uint (enc, MAJOR_POS_INT, SvIVX (sv));
437	else	589	else
438	encode_uint (enc, 0x20, -(SvIVX (sv) + 1));	590	encode_uint (enc, MAJOR_NEG_INT, -(SvIVX (sv) + 1));
439	}	591	}
440	else if (SvROK (sv))	592	else if (SvROK (sv))
441	encode_rv (enc, SvRV (sv));	593	encode_rv (enc, SvRV (sv));
442	else if (!SvOK (sv))	594	else if (!SvOK (sv))
443	encode_ch (enc, 0xe0 | 22);	595	encode_ch (enc, MAJOR_MISC | SIMPLE_NULL);
444	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)	596	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
445	encode_ch (enc, 0xe0 | 23);	597	encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF);
446	else	598	else
447	croak ("encountered perl type (%s,0x%x) that CBOR cannot handle, check your input data",	599	croak ("encountered perl type (%s,0x%x) that CBOR cannot handle, check your input data",
448	SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));	600	SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
449	}	601	}
450		602
451	static SV *	603	static SV *
452	encode_cbor (SV *scalar, CBOR *cbor)	604	encode_cbor (SV *scalar, CBOR *cbor)
453	{	605	{
454	enc_t enc;	606	enc_t enc = { 0 };
455		607
456	enc.cbor = *cbor;	608	enc.cbor = *cbor;
457	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	609	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
458	enc.cur = SvPVX (enc.sv);	610	enc.cur = SvPVX (enc.sv);
459	enc.end = SvEND (enc.sv);	611	enc.end = SvEND (enc.sv);
460	enc.depth = 0;
461		612
462	SvPOK_only (enc.sv);	613	SvPOK_only (enc.sv);
		614
		615	if (cbor->flags & F_PACK_STRINGS)
		616	{
		617	encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE);
		618	enc.stringref[0]= (HV *)sv_2mortal ((SV *)newHV ());
		619	enc.stringref[1]= (HV *)sv_2mortal ((SV *)newHV ());
		620	}
		621
463	encode_sv (&enc, scalar);	622	encode_sv (&enc, scalar);
464		623
465	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	624	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
466	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	625	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
467		626
…		…
481	U8 *end; // end of input string	640	U8 *end; // end of input string
482	const char *err; // parse error, if != 0	641	const char *err; // parse error, if != 0
483	CBOR cbor;	642	CBOR cbor;
484	U32 depth; // recursion depth	643	U32 depth; // recursion depth
485	U32 maxdepth; // recursion depth limit	644	U32 maxdepth; // recursion depth limit
		645	AV *shareable;
		646	AV *stringref;
		647	SV *decode_tagged;
486	} dec_t;	648	} dec_t;
487		649
488	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE	650	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE
489		651
490	#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")	652	#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")
…		…
493	#define DEC_DEC_DEPTH --dec->depth	655	#define DEC_DEC_DEPTH --dec->depth
494		656
495	static UV	657	static UV
496	decode_uint (dec_t *dec)	658	decode_uint (dec_t *dec)
497	{	659	{
498	switch (*dec->cur & 31)	660	U8 m = *dec->cur & MINOR_MASK;
499	{	661	++dec->cur;
500	case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:
501	case 8: case 9: case 10: case 11: case 12: case 13: case 14: case 15:
502	case 16: case 17: case 18: case 19: case 20: case 21: case 22: case 23:
503	return *dec->cur++ & 31;
504		662
505	case 24:	663	if (ecb_expect_true (m < LENGTH_EXT1))
		664	return m;
		665	else if (ecb_expect_true (m == LENGTH_EXT1))
		666	{
506	WANT (2);	667	WANT (1);
507	dec->cur += 2;	668	dec->cur += 1;
508	return dec->cur[-1];	669	return dec->cur[-1];
509		670	}
510	case 25:	671	else if (ecb_expect_true (m == LENGTH_EXT2))
		672	{
511	WANT (3);	673	WANT (2);
512	dec->cur += 3;	674	dec->cur += 2;
513	return (((UV)dec->cur[-2]) << 8)	675	return (((UV)dec->cur[-2]) << 8)
514	| ((UV)dec->cur[-1]);	676	| ((UV)dec->cur[-1]);
515		677	}
516	case 26:	678	else if (ecb_expect_true (m == LENGTH_EXT4))
		679	{
517	WANT (5);	680	WANT (4);
518	dec->cur += 5;	681	dec->cur += 4;
519	return (((UV)dec->cur[-4]) << 24)	682	return (((UV)dec->cur[-4]) << 24)
520	| (((UV)dec->cur[-3]) << 16)	683	| (((UV)dec->cur[-3]) << 16)
521	| (((UV)dec->cur[-2]) << 8)	684	| (((UV)dec->cur[-2]) << 8)
522	| ((UV)dec->cur[-1]);	685	| ((UV)dec->cur[-1]);
523		686	}
524	case 27:	687	else if (ecb_expect_true (m == LENGTH_EXT8))
		688	{
525	WANT (9);	689	WANT (8);
526	dec->cur += 9;	690	dec->cur += 8;
		691
		692	return
		693	#if UVSIZE < 8
		694	0
		695	#else
527	return (((UV)dec->cur[-8]) << 56)	696	(((UV)dec->cur[-8]) << 56)
528	| (((UV)dec->cur[-7]) << 48)	697	| (((UV)dec->cur[-7]) << 48)
529	| (((UV)dec->cur[-6]) << 40)	698	| (((UV)dec->cur[-6]) << 40)
530	| (((UV)dec->cur[-5]) << 32)	699	| (((UV)dec->cur[-5]) << 32)
		700	#endif
531	| (((UV)dec->cur[-4]) << 24)	701	| (((UV)dec->cur[-4]) << 24)
532	| (((UV)dec->cur[-3]) << 16)	702	| (((UV)dec->cur[-3]) << 16)
533	| (((UV)dec->cur[-2]) << 8)	703	| (((UV)dec->cur[-2]) << 8)
534	| ((UV)dec->cur[-1]);	704	| ((UV)dec->cur[-1]);
535		705	}
536	default:	706	else
537	ERR ("corrupted CBOR data (unsupported integer minor encoding)");	707	ERR ("corrupted CBOR data (unsupported integer minor encoding)");
538	}
539		708
540	fail:	709	fail:
541	return 0;	710	return 0;
542	}	711	}
543		712
…		…
548	{	717	{
549	AV *av = newAV ();	718	AV *av = newAV ();
550		719
551	DEC_INC_DEPTH;	720	DEC_INC_DEPTH;
552		721
553	if ((*dec->cur & 31) == 31)	722	if (*dec->cur == (MAJOR_ARRAY | MINOR_INDEF))
554	{	723	{
555	++dec->cur;	724	++dec->cur;
556		725
557	for (;;)	726	for (;;)
558	{	727	{
559	WANT (1);	728	WANT (1);
560		729
561	if (*dec->cur == (0xe0 | 31))	730	if (*dec->cur == (MAJOR_MISC | MINOR_INDEF))
562	{	731	{
563	++dec->cur;	732	++dec->cur;
564	break;	733	break;
565	}	734	}
566		735
…		…
569	}	738	}
570	else	739	else
571	{	740	{
572	int i, len = decode_uint (dec);	741	int i, len = decode_uint (dec);
573		742
		743	WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays
574	av_fill (av, len - 1);	744	av_fill (av, len - 1);
575		745
576	for (i = 0; i < len; ++i)	746	for (i = 0; i < len; ++i)
577	AvARRAY (av)[i] = decode_sv (dec);	747	AvARRAY (av)[i] = decode_sv (dec);
578	}	748	}
…		…
588		758
589	static void	759	static void
590	decode_he (dec_t *dec, HV *hv)	760	decode_he (dec_t *dec, HV *hv)
591	{	761	{
592	// for speed reasons, we specialcase single-string	762	// for speed reasons, we specialcase single-string
593	// byte or utf-8 strings as keys.	763	// byte or utf-8 strings as keys, but only when !stringref
594		764
595	if (*dec->cur >= 0x40 && *dec->cur <= 0x40 + 27)	765	if (ecb_expect_true (!dec->stringref))
		766	if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
596	{	767	{
597	I32 len = decode_uint (dec);	768	I32 len = decode_uint (dec);
598	char *key = (char *)dec->cur;	769	char *key = (char *)dec->cur;
599		770
		771	WANT (len);
600	dec->cur += len;	772	dec->cur += len;
601		773
602	hv_store (hv, key, len, decode_sv (dec), 0);	774	hv_store (hv, key, len, decode_sv (dec), 0);
		775
		776	return;
603	}	777	}
604	else if (*dec->cur >= 0x60 && *dec->cur <= 0x60 + 27)	778	else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8))
605	{	779	{
606	I32 len = decode_uint (dec);	780	I32 len = decode_uint (dec);
607	char *key = (char *)dec->cur;	781	char *key = (char *)dec->cur;
608		782
		783	WANT (len);
609	dec->cur += len;	784	dec->cur += len;
610		785
		786	if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
		787	if (!is_utf8_string (key, len))
		788	ERR ("corrupted CBOR data (invalid UTF-8 in map key)");
		789
611	hv_store (hv, key, -len, decode_sv (dec), 0);	790	hv_store (hv, key, -len, decode_sv (dec), 0);
		791
		792	return;
612	}	793	}
613	else	794
614	{
615	SV *k = decode_sv (dec);	795	SV *k = decode_sv (dec);
616	SV *v = decode_sv (dec);	796	SV *v = decode_sv (dec);
617		797
618	hv_store_ent (hv, k, v, 0);	798	hv_store_ent (hv, k, v, 0);
619	SvREFCNT_dec (k);	799	SvREFCNT_dec (k);
620	}	800
		801	fail:
		802	;
621	}	803	}
622		804
623	static SV *	805	static SV *
624	decode_hv (dec_t *dec)	806	decode_hv (dec_t *dec)
625	{	807	{
626	HV *hv = newHV ();	808	HV *hv = newHV ();
627		809
628	DEC_INC_DEPTH;	810	DEC_INC_DEPTH;
629		811
630	if ((*dec->cur & 31) == 31)	812	if (*dec->cur == (MAJOR_MAP | MINOR_INDEF))
631	{	813	{
632	++dec->cur;	814	++dec->cur;
633		815
634	for (;;)	816	for (;;)
635	{	817	{
636	WANT (1);	818	WANT (1);
637		819
638	if (*dec->cur == (0xe0 | 31))	820	if (*dec->cur == (MAJOR_MISC | MINOR_INDEF))
639	{	821	{
640	++dec->cur;	822	++dec->cur;
641	break;	823	break;
642	}	824	}
643		825
…		…
664	static SV *	846	static SV *
665	decode_str (dec_t *dec, int utf8)	847	decode_str (dec_t *dec, int utf8)
666	{	848	{
667	SV *sv = 0;	849	SV *sv = 0;
668		850
669	if ((*dec->cur & 31) == 31)	851	if ((*dec->cur & MINOR_MASK) == MINOR_INDEF)
670	{	852	{
		853	// indefinite length strings
671	++dec->cur;	854	++dec->cur;
672		855
		856	U8 major = *dec->cur & MAJOR_MISC;
		857
673	sv = newSVpvn ("", 0);	858	sv = newSVpvn ("", 0);
674		859
675	// not very fast, and certainly not robust against illegal input
676	for (;;)	860	for (;;)
677	{	861	{
678	WANT (1);	862	WANT (1);
679		863
680	if (*dec->cur == (0xe0 | 31))	864	if ((*dec->cur - major) > LENGTH_EXT8)
		865	if (*dec->cur == (MAJOR_MISC | MINOR_INDEF))
681	{	866	{
682	++dec->cur;	867	++dec->cur;
683	break;	868	break;
684	}	869	}
		870	else
		871	ERR ("corrupted CBOR data (invalid chunks in indefinite length string)");
685		872
686	sv_catsv (sv, decode_sv (dec));	873	STRLEN len = decode_uint (dec);
		874
		875	WANT (len);
		876	sv_catpvn (sv, dec->cur, len);
		877	dec->cur += len;
687	}	878	}
688	}	879	}
689	else	880	else
690	{	881	{
691	STRLEN len = decode_uint (dec);	882	STRLEN len = decode_uint (dec);
692		883
693	WANT (len);	884	WANT (len);
694	sv = newSVpvn (dec->cur, len);	885	sv = newSVpvn (dec->cur, len);
695	dec->cur += len;	886	dec->cur += len;
		887
		888	if (ecb_expect_false (dec->stringref)
		889	&& SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1))
		890	av_push (dec->stringref, SvREFCNT_inc_NN (sv));
696	}	891	}
697		892
698	if (utf8)	893	if (utf8)
		894	{
		895	if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
		896	if (!is_utf8_string (SvPVX (sv), SvCUR (sv)))
		897	ERR ("corrupted CBOR data (invalid UTF-8 in text string)");
		898
699	SvUTF8_on (sv);	899	SvUTF8_on (sv);
		900	}
700		901
701	return sv;	902	return sv;
702		903
703	fail:	904	fail:
704	SvREFCNT_dec (sv);	905	SvREFCNT_dec (sv);
…		…
706	}	907	}
707		908
708	static SV *	909	static SV *
709	decode_tagged (dec_t *dec)	910	decode_tagged (dec_t *dec)
710	{	911	{
		912	SV *sv = 0;
711	UV tag = decode_uint (dec);	913	UV tag = decode_uint (dec);
		914
		915	WANT (1);
		916
		917	switch (tag)
		918	{
		919	case CBOR_TAG_MAGIC:
712	SV *sv = decode_sv (dec);	920	sv = decode_sv (dec);
		921	break;
713		922
714	if (tag == CBOR_TAG_MAGIC)	923	case CBOR_TAG_INDIRECTION:
715	return sv;	924	sv = newRV_noinc (decode_sv (dec));
716	else if (tag == CBOR_TAG_PERL_OBJECT)	925	break;
717	{
718	if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
719	ERR ("corrupted CBOR data (non-array perl object)");
720		926
721	AV *av = (AV *)SvRV (sv);	927	case CBOR_TAG_STRINGREF_NAMESPACE:
722	int len = av_len (av) + 1;
723	HV *stash = gv_stashsv (*av_fetch (av, 0, 1), 0);
724
725	if (!stash)
726	ERR ("cannot decode perl-object (package does not exist)");
727
728	GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
729		928	{
730	if (!method)	929	ENTER; SAVETMPS;
731	ERR ("cannot decode perl-object (package does not have a THAW method)");
732
733	dSP;
734		930
735	ENTER; SAVETMPS; PUSHMARK (SP);	931	SAVESPTR (dec->stringref);
736	EXTEND (SP, len + 1);	932	dec->stringref = (AV *)sv_2mortal ((SV *)newAV ());
737	// we re-bless the reference to get overload and other niceties right
738	PUSHs (*av_fetch (av, 0, 1));
739	PUSHs (sv_cbor);
740		933
741	int i;	934	sv = decode_sv (dec);
742		935
743	for (i = 1; i < len; ++i)
744	PUSHs (*av_fetch (av, i, 1));
745
746	PUTBACK;
747	call_sv ((SV *)GvCV (method), G_SCALAR | G_EVAL);
748	SPAGAIN;
749
750	if (SvTRUE (ERRSV))
751	{
752	FREETMPS; LEAVE;	936	FREETMPS; LEAVE;
		937	}
		938	break;
		939
		940	case CBOR_TAG_STRINGREF:
		941	{
		942	if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
		943	ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
		944
		945	UV idx = decode_uint (dec);
		946
		947	if (!dec->stringref || (int)idx > AvFILLp (dec->stringref))
		948	ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)");
		949
		950	sv = newSVsv (AvARRAY (dec->stringref)[idx]);
		951	}
		952	break;
		953
		954	case CBOR_TAG_VALUE_SHAREABLE:
		955	{
		956	if (ecb_expect_false (!dec->shareable))
		957	dec->shareable = (AV *)sv_2mortal ((SV *)newAV ());
		958
		959	if (dec->cbor.flags & F_ALLOW_CYCLES)
		960	{
		961	sv = newSV (0);
		962	av_push (dec->shareable, SvREFCNT_inc_NN (sv));
		963
		964	SV *osv = decode_sv (dec);
		965	sv_setsv (sv, osv);
		966	SvREFCNT_dec_NN (osv);
		967	}
		968	else
		969	{
		970	av_push (dec->shareable, &PL_sv_undef);
		971	int idx = AvFILLp (dec->shareable);
		972	sv = decode_sv (dec);
		973	av_store (dec->shareable, idx, SvREFCNT_inc_NN (sv));
		974	}
		975	}
		976	break;
		977
		978	case CBOR_TAG_VALUE_SHAREDREF:
		979	{
		980	if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
		981	ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
		982
		983	UV idx = decode_uint (dec);
		984
		985	if (!dec->shareable || (int)idx > AvFILLp (dec->shareable))
		986	ERR ("corrupted CBOR data (sharedref index out of bounds)");
		987
		988	sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
		989
		990	if (sv == &PL_sv_undef)
		991	ERR ("cyclic CBOR data structure found, but allow_cycles is not enabled");
		992	}
		993	break;
		994
		995	case CBOR_TAG_PERL_OBJECT:
		996	{
		997	sv = decode_sv (dec);
		998
		999	if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
		1000	ERR ("corrupted CBOR data (non-array perl object)");
		1001
		1002	AV *av = (AV *)SvRV (sv);
		1003	int len = av_len (av) + 1;
		1004	HV *stash = gv_stashsv (*av_fetch (av, 0, 1), 0);
		1005
		1006	if (!stash)
		1007	ERR ("cannot decode perl-object (package does not exist)");
		1008
		1009	GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
		1010
		1011	if (!method)
		1012	ERR ("cannot decode perl-object (package does not have a THAW method)");
		1013
		1014	dSP;
		1015
		1016	ENTER; SAVETMPS;
		1017	PUSHMARK (SP);
		1018	EXTEND (SP, len + 1);
		1019	// we re-bless the reference to get overload and other niceties right
		1020	PUSHs (*av_fetch (av, 0, 1));
		1021	PUSHs (sv_cbor);
		1022
		1023	int i;
		1024
		1025	for (i = 1; i < len; ++i)
		1026	PUSHs (*av_fetch (av, i, 1));
		1027
		1028	PUTBACK;
		1029	call_sv ((SV *)GvCV (method), G_SCALAR | G_EVAL);
		1030	SPAGAIN;
		1031
		1032	if (SvTRUE (ERRSV))
		1033	{
		1034	FREETMPS; LEAVE;
753	ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));	1035	ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
754	}	1036	}
755		1037
756	SvREFCNT_dec (sv);	1038	SvREFCNT_dec (sv);
757	sv = SvREFCNT_inc (POPs);	1039	sv = SvREFCNT_inc (POPs);
758		1040
759	PUTBACK;	1041	PUTBACK;
760		1042
761	FREETMPS; LEAVE;	1043	FREETMPS; LEAVE;
		1044	}
		1045	break;
762		1046
763	return sv;	1047	default:
764	}	1048	{
765	else	1049	sv = decode_sv (dec);
766	{	1050
		1051	dSP;
		1052	ENTER; SAVETMPS;
		1053	SAVESTACK_POS ();
		1054	PUSHMARK (SP);
		1055	EXTEND (SP, 2);
		1056	PUSHs (newSVuv (tag));
		1057	PUSHs (sv);
		1058
		1059	PUTBACK;
		1060	int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL);
		1061	SPAGAIN;
		1062
		1063	if (SvTRUE (ERRSV))
		1064	{
		1065	FREETMPS; LEAVE;
		1066	ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
		1067	}
		1068
		1069	if (count)
		1070	{
		1071	SvREFCNT_dec (sv);
		1072	sv = SvREFCNT_inc (POPs);
		1073	}
		1074	else
		1075	{
767	AV *av = newAV ();	1076	AV *av = newAV ();
768	av_push (av, newSVuv (tag));	1077	av_push (av, newSVuv (tag));
769	av_push (av, sv);	1078	av_push (av, sv);
770		1079
771	HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash	1080	HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
772	? cbor_tagged_stash	1081	? cbor_tagged_stash
773	: gv_stashpv ("CBOR::XS::Tagged" , 1);	1082	: gv_stashpv ("CBOR::XS::Tagged" , 1);
774
775	return sv_bless (newRV_noinc ((SV *)av), tagged_stash);	1083	sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash);
		1084	}
		1085
		1086	PUTBACK;
		1087
		1088	FREETMPS; LEAVE;
		1089	}
		1090	break;
776	}	1091	}
		1092
		1093	return sv;
777		1094
778	fail:	1095	fail:
779	SvREFCNT_dec (sv);	1096	SvREFCNT_dec (sv);
780	return &PL_sv_undef;	1097	return &PL_sv_undef;
781	}	1098	}
…		…
783	static SV *	1100	static SV *
784	decode_sv (dec_t *dec)	1101	decode_sv (dec_t *dec)
785	{	1102	{
786	WANT (1);	1103	WANT (1);
787		1104
788	switch (*dec->cur >> 5)	1105	switch (*dec->cur >> MAJOR_SHIFT)
789	{	1106	{
790	case 0: // unsigned int	1107	case MAJOR_POS_INT >> MAJOR_SHIFT: return newSVuv (decode_uint (dec));
791	return newSVuv (decode_uint (dec));	1108	case MAJOR_NEG_INT >> MAJOR_SHIFT: return newSViv (-1 - (IV)decode_uint (dec));
792	case 1: // negative int	1109	case MAJOR_BYTES >> MAJOR_SHIFT: return decode_str (dec, 0);
793	return newSViv (-1 - (IV)decode_uint (dec));	1110	case MAJOR_TEXT >> MAJOR_SHIFT: return decode_str (dec, 1);
794	case 2: // octet string	1111	case MAJOR_ARRAY >> MAJOR_SHIFT: return decode_av (dec);
795	return decode_str (dec, 0);	1112	case MAJOR_MAP >> MAJOR_SHIFT: return decode_hv (dec);
796	case 3: // utf-8 string	1113	case MAJOR_TAG >> MAJOR_SHIFT: return decode_tagged (dec);
797	return decode_str (dec, 1);	1114
798	case 4: // array	1115	case MAJOR_MISC >> MAJOR_SHIFT:
799	return decode_av (dec);
800	case 5: // map
801	return decode_hv (dec);
802	case 6: // tag
803	return decode_tagged (dec);
804	case 7: // misc
805	switch (*dec->cur++ & 31)	1116	switch (*dec->cur++ & MINOR_MASK)
806	{	1117	{
807	case 20:	1118	case SIMPLE_FALSE:
808	#if CBOR_SLOW	1119	#if CBOR_SLOW
809	types_false = get_bool ("Types::Serialiser::false");	1120	types_false = get_bool ("Types::Serialiser::false");
810	#endif	1121	#endif
811	return newSVsv (types_false);	1122	return newSVsv (types_false);
812	case 21:	1123	case SIMPLE_TRUE:
813	#if CBOR_SLOW	1124	#if CBOR_SLOW
814	types_true = get_bool ("Types::Serialiser::true");	1125	types_true = get_bool ("Types::Serialiser::true");
815	#endif	1126	#endif
816	return newSVsv (types_true);	1127	return newSVsv (types_true);
817	case 22:	1128	case SIMPLE_NULL:
818	return newSVsv (&PL_sv_undef);	1129	return newSVsv (&PL_sv_undef);
819	case 23:	1130	case SIMPLE_UNDEF:
820	#if CBOR_SLOW	1131	#if CBOR_SLOW
821	types_error = get_bool ("Types::Serialiser::error");	1132	types_error = get_bool ("Types::Serialiser::error");
822	#endif	1133	#endif
823	return newSVsv (types_error);	1134	return newSVsv (types_error);
824		1135
825	case 25:	1136	case MISC_FLOAT16:
826	{	1137	{
827	WANT (2);	1138	WANT (2);
828		1139
829	uint16_t fp = (dec->cur[0] << 8) | dec->cur[1];	1140	uint16_t fp = (dec->cur[0] << 8) | dec->cur[1];
830	dec->cur += 2;	1141	dec->cur += 2;
831		1142
832	return newSVnv (ecb_binary16_to_float (fp));	1143	return newSVnv (ecb_binary16_to_float (fp));
833	}	1144	}
834		1145
835	case 26:	1146	case MISC_FLOAT32:
836	{	1147	{
837	uint32_t fp;	1148	uint32_t fp;
838	WANT (4);	1149	WANT (4);
839	memcpy (&fp, dec->cur, 4);	1150	memcpy (&fp, dec->cur, 4);
840	dec->cur += 4;	1151	dec->cur += 4;
…		…
843	fp = ecb_bswap32 (fp);	1154	fp = ecb_bswap32 (fp);
844		1155
845	return newSVnv (ecb_binary32_to_float (fp));	1156	return newSVnv (ecb_binary32_to_float (fp));
846	}	1157	}
847		1158
848	case 27:	1159	case MISC_FLOAT64:
849	{	1160	{
850	uint64_t fp;	1161	uint64_t fp;
851	WANT (8);	1162	WANT (8);
852	memcpy (&fp, dec->cur, 8);	1163	memcpy (&fp, dec->cur, 8);
853	dec->cur += 8;	1164	dec->cur += 8;
…		…
856	fp = ecb_bswap64 (fp);	1167	fp = ecb_bswap64 (fp);
857		1168
858	return newSVnv (ecb_binary64_to_double (fp));	1169	return newSVnv (ecb_binary64_to_double (fp));
859	}	1170	}
860		1171
861	// 0..19 unassigned	1172	// 0..19 unassigned simple
862	// 24 reserved + unassigned (reserved values are not encodable)	1173	// 24 reserved + unassigned simple (reserved values are not encodable)
		1174	// 28-30 unassigned misc
		1175	// 31 break code
863	default:	1176	default:
864	ERR ("corrupted CBOR data (reserved/unassigned major 7 value)");	1177	ERR ("corrupted CBOR data (reserved/unassigned/unexpected major 7 value)");
865	}	1178	}
866		1179
867	break;	1180	break;
868	}	1181	}
869		1182
…		…
872	}	1185	}
873		1186
874	static SV *	1187	static SV *
875	decode_cbor (SV *string, CBOR *cbor, char **offset_return)	1188	decode_cbor (SV *string, CBOR *cbor, char **offset_return)
876	{	1189	{
877	dec_t dec;	1190	dec_t dec = { 0 };
878	SV *sv;	1191	SV *sv;
879	STRLEN len;	1192	STRLEN len;
880	char *data = SvPVbyte (string, len);	1193	char *data = SvPVbyte (string, len);
881		1194
882	if (len > cbor->max_size && cbor->max_size)	1195	if (len > cbor->max_size && cbor->max_size)
…		…
884	(unsigned long)len, (unsigned long)cbor->max_size);	1197	(unsigned long)len, (unsigned long)cbor->max_size);
885		1198
886	dec.cbor = *cbor;	1199	dec.cbor = *cbor;
887	dec.cur = (U8 *)data;	1200	dec.cur = (U8 *)data;
888	dec.end = (U8 *)data + len;	1201	dec.end = (U8 *)data + len;
889	dec.err = 0;
890	dec.depth = 0;
891		1202
892	sv = decode_sv (&dec);	1203	sv = decode_sv (&dec);
893		1204
894	if (offset_return)	1205	if (offset_return)
895	*offset_return = dec.cur;	1206	*offset_return = dec.cur;
…		…
898	if (dec.cur != dec.end && !dec.err)	1209	if (dec.cur != dec.end && !dec.err)
899	dec.err = "garbage after CBOR object";	1210	dec.err = "garbage after CBOR object";
900		1211
901	if (dec.err)	1212	if (dec.err)
902	{	1213	{
		1214	if (dec.shareable)
		1215	{
		1216	// need to break cyclic links, which whould all be in shareable
		1217	int i;
		1218	SV **svp;
		1219
		1220	for (i = av_len (dec.shareable) + 1; i--; )
		1221	if ((svp = av_fetch (dec.shareable, i, 0)))
		1222	sv_setsv (*svp, &PL_sv_undef);
		1223	}
		1224
903	SvREFCNT_dec (sv);	1225	SvREFCNT_dec (sv);
904	croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur);	1226	croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur);
905	}	1227	}
906		1228
907	sv = sv_2mortal (sv);	1229	sv = sv_2mortal (sv);
908		1230
909	return sv;	1231	return sv;
910	}	1232	}
911		1233
		1234	/////////////////////////////////////////////////////////////////////////////
		1235	// incremental parser
		1236
		1237	#define INCR_DONE(cbor) (AvFILLp (cbor->incr_count) < 0)
		1238
		1239	// returns 0 for notyet, 1 for success or error
		1240	static int
		1241	incr_parse (CBOR *self, SV *cborstr)
		1242	{
		1243	STRLEN cur;
		1244	SvPV (cborstr, cur);
		1245
		1246	while (ecb_expect_true (self->incr_need <= cur))
		1247	{
		1248	// table of integer count bytes
		1249	static I8 incr_len[MINOR_MASK + 1] = {
		1250	0, 0, 0, 0, 0, 0, 0, 0,
		1251	0, 0, 0, 0, 0, 0, 0, 0,
		1252	0, 0, 0, 0, 0, 0, 0, 0,
		1253	1, 2, 4, 8,-1,-1,-1,-2
		1254	};
		1255
		1256	const U8 *p = SvPVX (cborstr) + self->incr_pos;
		1257	U8 m = *p & MINOR_MASK;
		1258	IV count = SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]);
		1259	I8 ilen = incr_len[m];
		1260
		1261	self->incr_need = self->incr_pos + 1;
		1262
		1263	if (ecb_expect_false (ilen < 0))
		1264	{
		1265	if (m != MINOR_INDEF)
		1266	return 1; // error
		1267
		1268	if (*p == (MAJOR_MISC | MINOR_INDEF))
		1269	{
		1270	if (count >= 0)
		1271	return 1; // error
		1272
		1273	count = 1;
		1274	}
		1275	else
		1276	{
		1277	av_push (self->incr_count, newSViv (-1)); //TODO: nest
		1278	count = -1;
		1279	}
		1280	}
		1281	else
		1282	{
		1283	self->incr_need += ilen;
		1284	if (ecb_expect_false (self->incr_need > cur))
		1285	return 0;
		1286
		1287	int major = *p >> MAJOR_SHIFT;
		1288
		1289	switch (major)
		1290	{
		1291	case MAJOR_TAG >> MAJOR_SHIFT:
		1292	++count; // tags merely prefix another value
		1293	break;
		1294
		1295	case MAJOR_BYTES >> MAJOR_SHIFT:
		1296	case MAJOR_TEXT >> MAJOR_SHIFT:
		1297	case MAJOR_ARRAY >> MAJOR_SHIFT:
		1298	case MAJOR_MAP >> MAJOR_SHIFT:
		1299	{
		1300	UV len;
		1301
		1302	if (ecb_expect_false (ilen))
		1303	{
		1304	len = 0;
		1305
		1306	do {
		1307	len = (len << 8) | *++p;
		1308	} while (--ilen);
		1309	}
		1310	else
		1311	len = m;
		1312
		1313	switch (major)
		1314	{
		1315	case MAJOR_BYTES >> MAJOR_SHIFT:
		1316	case MAJOR_TEXT >> MAJOR_SHIFT:
		1317	self->incr_need += len;
		1318	if (ecb_expect_false (self->incr_need > cur))
		1319	return 0;
		1320
		1321	break;
		1322
		1323	case MAJOR_MAP >> MAJOR_SHIFT:
		1324	len <<= 1;
		1325	case MAJOR_ARRAY >> MAJOR_SHIFT:
		1326	if (len)
		1327	{
		1328	av_push (self->incr_count, newSViv (len + 1)); //TODO: nest
		1329	count = len + 1;
		1330	}
		1331	break;
		1332	}
		1333	}
		1334	}
		1335	}
		1336
		1337	self->incr_pos = self->incr_need;
		1338
		1339	if (count > 0)
		1340	{
		1341	while (!--count)
		1342	{
		1343	if (!AvFILLp (self->incr_count))
		1344	return 1; // done
		1345
		1346	SvREFCNT_dec_NN (av_pop (self->incr_count));
		1347	count = SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]);
		1348	}
		1349
		1350	SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]) = count;
		1351	}
		1352	}
		1353
		1354	return 0;
		1355	}
		1356
		1357
912	/////////////////////////////////////////////////////////////////////////////	1358	/////////////////////////////////////////////////////////////////////////////
913	// XS interface functions	1359	// XS interface functions
914		1360
915	MODULE = CBOR::XS PACKAGE = CBOR::XS	1361	MODULE = CBOR::XS PACKAGE = CBOR::XS
916		1362
…		…
923	types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);	1369	types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);
924		1370
925	types_true = get_bool ("Types::Serialiser::true" );	1371	types_true = get_bool ("Types::Serialiser::true" );
926	types_false = get_bool ("Types::Serialiser::false");	1372	types_false = get_bool ("Types::Serialiser::false");
927	types_error = get_bool ("Types::Serialiser::error");	1373	types_error = get_bool ("Types::Serialiser::error");
		1374
		1375	default_filter = newSVpv ("CBOR::XS::default_filter", 0);
928		1376
929	sv_cbor = newSVpv ("CBOR", 0);	1377	sv_cbor = newSVpv ("CBOR", 0);
930	SvREADONLY_on (sv_cbor);	1378	SvREADONLY_on (sv_cbor);
931	}	1379	}
932		1380
…		…
953		1401
954	void shrink (CBOR *self, int enable = 1)	1402	void shrink (CBOR *self, int enable = 1)
955	ALIAS:	1403	ALIAS:
956	shrink = F_SHRINK	1404	shrink = F_SHRINK
957	allow_unknown = F_ALLOW_UNKNOWN	1405	allow_unknown = F_ALLOW_UNKNOWN
		1406	allow_sharing = F_ALLOW_SHARING
		1407	allow_cycles = F_ALLOW_CYCLES
		1408	pack_strings = F_PACK_STRINGS
		1409	utf8_strings = F_UTF8_STRINGS
		1410	validate_utf8 = F_VALIDATE_UTF8
958	PPCODE:	1411	PPCODE:
959	{	1412	{
960	if (enable)	1413	if (enable)
961	self->flags |= ix;	1414	self->flags |= ix;
962	else	1415	else
…		…
967		1420
968	void get_shrink (CBOR *self)	1421	void get_shrink (CBOR *self)
969	ALIAS:	1422	ALIAS:
970	get_shrink = F_SHRINK	1423	get_shrink = F_SHRINK
971	get_allow_unknown = F_ALLOW_UNKNOWN	1424	get_allow_unknown = F_ALLOW_UNKNOWN
		1425	get_allow_sharing = F_ALLOW_SHARING
		1426	get_allow_cycles = F_ALLOW_CYCLES
		1427	get_pack_strings = F_PACK_STRINGS
		1428	get_validate_utf8 = F_VALIDATE_UTF8
972	PPCODE:	1429	PPCODE:
973	XPUSHs (boolSV (self->flags & ix));	1430	XPUSHs (boolSV (self->flags & ix));
974		1431
975	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)	1432	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
976	PPCODE:	1433	PPCODE:
…		…
989	XPUSHs (ST (0));	1446	XPUSHs (ST (0));
990		1447
991	int get_max_size (CBOR *self)	1448	int get_max_size (CBOR *self)
992	CODE:	1449	CODE:
993	RETVAL = self->max_size;	1450	RETVAL = self->max_size;
		1451	OUTPUT:
		1452	RETVAL
		1453
		1454	void filter (CBOR *self, SV *filter = 0)
		1455	PPCODE:
		1456	SvREFCNT_dec (self->filter);
		1457	self->filter = filter ? newSVsv (filter) : filter;
		1458	XPUSHs (ST (0));
		1459
		1460	SV *get_filter (CBOR *self)
		1461	CODE:
		1462	RETVAL = self->filter ? self->filter : NEWSV (0, 0);
994	OUTPUT:	1463	OUTPUT:
995	RETVAL	1464	RETVAL
996		1465
997	void encode (CBOR *self, SV *scalar)	1466	void encode (CBOR *self, SV *scalar)
998	PPCODE:	1467	PPCODE:
…		…
1013	EXTEND (SP, 2);	1482	EXTEND (SP, 2);
1014	PUSHs (sv);	1483	PUSHs (sv);
1015	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));	1484	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1016	}	1485	}
1017		1486
		1487	void incr_parse (CBOR *self, SV *cborstr)
		1488	ALIAS:
		1489	incr_parse_multiple = 1
		1490	PPCODE:
		1491	{
		1492	if (SvUTF8 (cborstr))
		1493	sv_utf8_downgrade (cborstr, 0);
		1494
		1495	if (!self->incr_count)
		1496	{
		1497	self->incr_count = newAV ();
		1498	self->incr_pos = 0;
		1499	self->incr_need = 1;
		1500
		1501	av_push (self->incr_count, newSViv (1));
		1502	}
		1503
		1504	do
		1505	{
		1506	if (!incr_parse (self, cborstr))
		1507	{
		1508	if (self->incr_need > self->max_size && self->max_size)
		1509	croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",
		1510	(unsigned long)self->incr_need, (unsigned long)self->max_size);
		1511
		1512	break;
		1513	}
		1514
		1515	SV *sv;
		1516	char *offset;
		1517
		1518	PUTBACK; sv = decode_cbor (cborstr, self, &offset); SPAGAIN;
		1519	XPUSHs (sv);
		1520
		1521	sv_chop (cborstr, offset);
		1522
		1523	av_clear (self->incr_count);
		1524	av_push (self->incr_count, newSViv (1));
		1525
		1526	self->incr_pos = 0;
		1527	self->incr_need = self->incr_pos + 1;
		1528	}
		1529	while (ix);
		1530	}
		1531
		1532	void incr_reset (CBOR *self)
		1533	CODE:
		1534	{
		1535	SvREFCNT_dec (self->incr_count);
		1536	self->incr_count = 0;
		1537	}
		1538
		1539	void DESTROY (CBOR *self)
		1540	PPCODE:
		1541	cbor_free (self);
		1542
1018	PROTOTYPES: ENABLE	1543	PROTOTYPES: ENABLE
1019		1544
1020	void encode_cbor (SV *scalar)	1545	void encode_cbor (SV *scalar)
		1546	ALIAS:
		1547	encode_cbor = 0
		1548	encode_cbor_sharing = F_ALLOW_SHARING
1021	PPCODE:	1549	PPCODE:
1022	{	1550	{
1023	CBOR cbor;	1551	CBOR cbor;
1024	cbor_init (&cbor);	1552	cbor_init (&cbor);
		1553	cbor.flags |= ix;
1025	PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN;	1554	PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN;
1026	XPUSHs (scalar);	1555	XPUSHs (scalar);
1027	}	1556	}
1028		1557
1029	void decode_cbor (SV *cborstr)	1558	void decode_cbor (SV *cborstr)

Diff Legend

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