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

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

Diff Legend

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

Comparing CBOR-XS/XS.xs (file contents): Revision 1.19 by root, Wed Nov 20 02:03:09 2013 UTC vs. Revision 1.44 by root, Tue Feb 18 22:12:12 2014 UTC

Diff Legend

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.19 by root, Wed Nov 20 02:03:09 2013 UTC vs.
Revision 1.44 by root, Tue Feb 18 22:12:12 2014 UTC