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

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.26 by root, Fri Nov 22 09:40:13 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
		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
62	#define F_ALLOW_STRINGREF 0x00000008UL //TODO	103	#define F_ALLOW_CYCLES 0x00000008UL
		104	#define F_PACK_STRINGS 0x00000010UL
		105	#define F_UTF8_STRINGS 0x00000020UL
		106	#define F_VALIDATE_UTF8 0x00000040UL
63		107
64	#define INIT_SIZE 32 // initial scalar size to be allocated	108	#define INIT_SIZE 32 // initial scalar size to be allocated
65		109
66	#define SB do {	110	#define SB do {
67	#define SE } while (0)	111	#define SE } while (0)
…		…
79	# define CBOR_SLOW 0	123	# define CBOR_SLOW 0
80	# define CBOR_STASH cbor_stash	124	# define CBOR_STASH cbor_stash
81	#endif	125	#endif
82		126
83	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::
84	static SV types_true, types_false, types_error, sv_cbor;	128	static SV types_true, types_false, types_error, sv_cbor, *default_filter;
85		129
86	typedef struct {	130	typedef struct {
87	U32 flags;	131	U32 flags;
88	U32 max_depth;	132	U32 max_depth;
89	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.
90	} CBOR;	140	} CBOR;
91		141
92	ecb_inline void	142	ecb_inline void
93	cbor_init (CBOR *cbor)	143	cbor_init (CBOR *cbor)
94	{	144	{
95	Zero (cbor, 1, CBOR);	145	Zero (cbor, 1, CBOR);
96	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);
97	}	154	}
98		155
99	/////////////////////////////////////////////////////////////////////////////	156	/////////////////////////////////////////////////////////////////////////////
100	// utility functions	157	// utility functions
101		158
…		…
131	{	188	{
132	return idx > 23	189	return idx > 23
133	? idx > 0xffU	190	? idx > 0xffU
134	? idx > 0xffffU	191	? idx > 0xffffU
135	? idx > 0xffffffffU	192	? idx > 0xffffffffU
		193	? 11
136	? 7	194	: 7
137	: 6
138	: 5	195	: 5
139	: 4	196	: 4
140	: 3;	197	: 3;
141	}	198	}
142		199
…		…
179	static void	236	static void
180	encode_uint (enc_t *enc, int major, UV len)	237	encode_uint (enc_t *enc, int major, UV len)
181	{	238	{
182	need (enc, 9);	239	need (enc, 9);
183		240
184	if (len < 24)	241	if (ecb_expect_true (len < LENGTH_EXT1))
185	*enc->cur++ = major \| len;	242	*enc->cur++ = major \| len;
186	else if (len <= 0xff)	243	else if (ecb_expect_true (len <= 0xffU))
187	{	244	{
188	*enc->cur++ = major \| 24;	245	*enc->cur++ = major \| LENGTH_EXT1;
189	*enc->cur++ = len;	246	*enc->cur++ = len;
190	}	247	}
191	else if (len <= 0xffff)	248	else if (len <= 0xffffU)
192	{	249	{
193	*enc->cur++ = major \| 25;	250	*enc->cur++ = major \| LENGTH_EXT2;
194	*enc->cur++ = len >> 8;	251	*enc->cur++ = len >> 8;
195	*enc->cur++ = len;	252	*enc->cur++ = len;
196	}	253	}
197	else if (len <= 0xffffffff)	254	else if (len <= 0xffffffffU)
198	{	255	{
199	*enc->cur++ = major \| 26;	256	*enc->cur++ = major \| LENGTH_EXT4;
200	*enc->cur++ = len >> 24;	257	*enc->cur++ = len >> 24;
201	*enc->cur++ = len >> 16;	258	*enc->cur++ = len >> 16;
202	*enc->cur++ = len >> 8;	259	*enc->cur++ = len >> 8;
203	*enc->cur++ = len;	260	*enc->cur++ = len;
204	}	261	}
205	else	262	else
206	{	263	{
207	*enc->cur++ = major \| 27;	264	*enc->cur++ = major \| LENGTH_EXT8;
208	*enc->cur++ = len >> 56;	265	*enc->cur++ = len >> 56;
209	*enc->cur++ = len >> 48;	266	*enc->cur++ = len >> 48;
210	*enc->cur++ = len >> 40;	267	*enc->cur++ = len >> 40;
211	*enc->cur++ = len >> 32;	268	*enc->cur++ = len >> 32;
212	*enc->cur++ = len >> 24;	269	*enc->cur++ = len >> 24;
…		…
217	}	274	}
218		275
219	ecb_inline void	276	ecb_inline void
220	encode_tag (enc_t *enc, UV tag)	277	encode_tag (enc_t *enc, UV tag)
221	{	278	{
222	encode_uint (enc, 0xc0, tag);	279	encode_uint (enc, MAJOR_TAG, tag);
		280	}
		281
		282	ecb_inline void
		283	encode_str (enc_t enc, int utf8, char str, STRLEN len)
		284	{
		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);
		299	need (enc, len);
		300	memcpy (enc->cur, str, len);
		301	enc->cur += len;
223	}	302	}
224		303
225	static void	304	static void
226	encode_str (enc_t enc, int utf8, char str, STRLEN len)	305	encode_strref (enc_t enc, int utf8, char str, STRLEN len)
227	{	306	{
228	if (ecb_expect_false (enc->cbor.flags & F_ALLOW_STRINGREF))	307	if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS))
229	{	308	{
230	SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);	309	SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);
231		310
232	if (SvOK (*svp))	311	if (SvOK (*svp))
233	{	312	{
234	// already registered, use stringref	313	// already registered, use stringref
235	encode_tag (enc, CBOR_TAG_STRINGREF);	314	encode_tag (enc, CBOR_TAG_STRINGREF);
236	encode_uint (enc, 0x00, SvUV (*svp));	315	encode_uint (enc, MAJOR_POS_INT, SvUV (*svp));
237	return;	316	return;
238	}	317	}
239	else if (len >= minimum_string_length (enc->stringref_idx))	318	else if (len >= minimum_string_length (enc->stringref_idx))
240	{	319	{
241	// register only	320	// register only
242	sv_setuv (*svp, enc->stringref_idx);	321	sv_setuv (*svp, enc->stringref_idx);
243	++enc->stringref_idx;	322	++enc->stringref_idx;
244	}	323	}
245	}	324	}
246		325
247	encode_uint (enc, utf8 ? 0x60 : 0x40, len);	326	encode_str (enc, utf8, str, len);
248	need (enc, len);
249	memcpy (enc->cur, str, len);
250	enc->cur += len;
251	}	327	}
252		328
253	static void encode_sv (enc_t enc, SV sv);	329	static void encode_sv (enc_t enc, SV sv);
254		330
255	static void	331	static void
…		…
260	if (enc->depth >= enc->cbor.max_depth)	336	if (enc->depth >= enc->cbor.max_depth)
261	croak (ERR_NESTING_EXCEEDED);	337	croak (ERR_NESTING_EXCEEDED);
262		338
263	++enc->depth;	339	++enc->depth;
264		340
265	encode_uint (enc, 0x80, len + 1);	341	encode_uint (enc, MAJOR_ARRAY, len + 1);
266		342
		343	if (SvMAGICAL (av))
267	for (i = 0; i <= len; ++i)	344	for (i = 0; i <= len; ++i)
268	{	345	{
269	SV **svp = av_fetch (av, i, 0);	346	SV **svp = av_fetch (av, i, 0);
270	encode_sv (enc, svp ? *svp : &PL_sv_undef);	347	encode_sv (enc, svp ? *svp : &PL_sv_undef);
271	}	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	}
272		355
273	--enc->depth;	356	--enc->depth;
274	}	357	}
275		358
276	static void	359	static void
…		…
285		368
286	int pairs = hv_iterinit (hv);	369	int pairs = hv_iterinit (hv);
287	int mg = SvMAGICAL (hv);	370	int mg = SvMAGICAL (hv);
288		371
289	if (mg)	372	if (mg)
290	encode_ch (enc, 0xa0 \| 31);	373	encode_ch (enc, MAJOR_MAP \| MINOR_INDEF);
291	else	374	else
292	encode_uint (enc, 0xa0, pairs);	375	encode_uint (enc, MAJOR_MAP, pairs);
293		376
294	while ((he = hv_iternext (hv)))	377	while ((he = hv_iternext (hv)))
295	{	378	{
296	if (HeKLEN (he) == HEf_SVKEY)	379	if (HeKLEN (he) == HEf_SVKEY)
297	encode_sv (enc, HeSVKEY (he));	380	encode_sv (enc, HeSVKEY (he));
298	else	381	else
299	encode_str (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));	382	encode_strref (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));
300		383
301	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));
302	}	385	}
303		386
304	if (mg)	387	if (mg)
305	encode_ch (enc, 0xe0 \| 31);	388	encode_ch (enc, MAJOR_MISC \| MINOR_INDEF);
306		389
307	--enc->depth;	390	--enc->depth;
308	}	391	}
309		392
310	// encode objects, arrays and special \0=false and \1=true values.	393	// encode objects, arrays and special \0=false and \1=true values.
311	static void	394	static void
312	encode_rv (enc_t enc, SV sv)	395	encode_rv (enc_t enc, SV sv)
313	{	396	{
314	SvGETMAGIC (sv);	397	SvGETMAGIC (sv);
315
316	if (ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)
317	&& ecb_expect_false (SvREFCNT (sv) > 1))
318	{
319	if (!enc->shareable)
320	enc->shareable = (HV )sv_2mortal ((SV )newHV ());
321
322	SV *svp = hv_fetch (enc->shareable, (char )&sv, sizeof (sv), 1);
323
324	if (SvOK (*svp))
325	{
326	encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
327	encode_uint (enc, 0x00, SvUV (*svp));
328	return;
329	}
330	else
331	{
332	sv_setuv (*svp, enc->shareable_idx);
333	++enc->shareable_idx;
334	encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
335	}
336	}
337		398
338	svtype svt = SvTYPE (sv);	399	svtype svt = SvTYPE (sv);
339		400
340	if (ecb_expect_false (SvOBJECT (sv)))	401	if (ecb_expect_false (SvOBJECT (sv)))
341	{	402	{
…		…
348	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash	409	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
349	? cbor_tagged_stash	410	? cbor_tagged_stash
350	: gv_stashpv ("CBOR::XS::Tagged" , 1);	411	: gv_stashpv ("CBOR::XS::Tagged" , 1);
351		412
352	HV *stash = SvSTASH (sv);	413	HV *stash = SvSTASH (sv);
353	GV *method;
354		414
355	if (stash == boolean_stash)	415	if (stash == boolean_stash)
356	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	}
357	else if (stash == error_stash)	420	else if (stash == error_stash)
358	encode_ch (enc, 0xe0 \| 23);	421	{
		422	encode_ch (enc, MAJOR_MISC \| SIMPLE_UNDEF);
		423	return;
		424	}
359	else if (stash == tagged_stash)	425	else if (stash == tagged_stash)
360	{	426	{
361	if (svt != SVt_PVAV)	427	if (svt != SVt_PVAV)
362	croak ("encountered CBOR::XS::Tagged object that isn't an array");	428	croak ("encountered CBOR::XS::Tagged object that isn't an array");
363		429
364	encode_uint (enc, 0xc0, SvUV (av_fetch ((AV )sv, 0, 1)));	430	encode_uint (enc, MAJOR_TAG, SvUV (av_fetch ((AV )sv, 0, 1)));
365	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))
366	}	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
367	else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))	464	if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
368	{	465	{
369	dSP;	466	dSP;
370		467
371	ENTER; SAVETMPS; PUSHMARK (SP);	468	ENTER; SAVETMPS;
		469	PUSHMARK (SP);
372	// 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
373	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));	471	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
374		472
375	PUTBACK;	473	PUTBACK;
376	// G_SCALAR ensures that return value is 1	474	// G_SCALAR ensures that return value is 1
…		…
389	}	487	}
390	else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)	488	else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
391	{	489	{
392	dSP;	490	dSP;
393		491
394	ENTER; SAVETMPS; PUSHMARK (SP);	492	ENTER; SAVETMPS;
		493	SAVESTACK_POS ();
		494	PUSHMARK (SP);
395	EXTEND (SP, 2);	495	EXTEND (SP, 2);
396	// 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
397	PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));	497	PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
398	PUSHs (sv_cbor);	498	PUSHs (sv_cbor);
399		499
…		…
404	// catch this surprisingly common error	504	// catch this surprisingly common error
405	if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)	505	if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
406	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));
407		507
408	encode_tag (enc, CBOR_TAG_PERL_OBJECT);	508	encode_tag (enc, CBOR_TAG_PERL_OBJECT);
409	encode_uint (enc, 0x80, count + 1);	509	encode_uint (enc, MAJOR_ARRAY, count + 1);
410	encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));	510	encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
411		511
412	while (count)	512	while (count)
413	encode_sv (enc, SP[1 - count--]);	513	encode_sv (enc, SP[1 - count--]);
414		514
415	PUTBACK;	515	PUTBACK;
…		…
436	{	536	{
437	double nv = SvNVX (sv);	537	double nv = SvNVX (sv);
438		538
439	need (enc, 9);	539	need (enc, 9);
440		540
441	if (ecb_expect_false (nv == (U32)nv))	541	if (ecb_expect_false (nv == (NV)(U32)nv))
442	encode_uint (enc, 0x00, (U32)nv);	542	encode_uint (enc, MAJOR_POS_INT, (U32)nv);
443	//TODO: maybe I32?	543	//TODO: maybe I32?
444	else if (ecb_expect_false (nv == (float)nv))	544	else if (ecb_expect_false (nv == (float)nv))
445	{	545	{
446	uint32_t fp = ecb_float_to_binary32 (nv);	546	uint32_t fp = ecb_float_to_binary32 (nv);
447		547
448	*enc->cur++ = 0xe0 \| 26;	548	*enc->cur++ = MAJOR_MISC \| MISC_FLOAT32;
449		549
450	if (!ecb_big_endian ())	550	if (!ecb_big_endian ())
451	fp = ecb_bswap32 (fp);	551	fp = ecb_bswap32 (fp);
452		552
453	memcpy (enc->cur, &fp, 4);	553	memcpy (enc->cur, &fp, 4);
…		…
455	}	555	}
456	else	556	else
457	{	557	{
458	uint64_t fp = ecb_double_to_binary64 (nv);	558	uint64_t fp = ecb_double_to_binary64 (nv);
459		559
460	*enc->cur++ = 0xe0 \| 27;	560	*enc->cur++ = MAJOR_MISC \| MISC_FLOAT64;
461		561
462	if (!ecb_big_endian ())	562	if (!ecb_big_endian ())
463	fp = ecb_bswap64 (fp);	563	fp = ecb_bswap64 (fp);
464		564
465	memcpy (enc->cur, &fp, 8);	565	memcpy (enc->cur, &fp, 8);
…		…
474		574
475	if (SvPOKp (sv))	575	if (SvPOKp (sv))
476	{	576	{
477	STRLEN len;	577	STRLEN len;
478	char *str = SvPV (sv, len);	578	char *str = SvPV (sv, len);
479	encode_str (enc, SvUTF8 (sv), str, len);	579	encode_strref (enc, SvUTF8 (sv), str, len);
480	}	580	}
481	else if (SvNOKp (sv))	581	else if (SvNOKp (sv))
482	encode_nv (enc, sv);	582	encode_nv (enc, sv);
483	else if (SvIOKp (sv))	583	else if (SvIOKp (sv))
484	{	584	{
485	if (SvIsUV (sv))	585	if (SvIsUV (sv))
486	encode_uint (enc, 0x00, SvUVX (sv));	586	encode_uint (enc, MAJOR_POS_INT, SvUVX (sv));
487	else if (SvIVX (sv) >= 0)	587	else if (SvIVX (sv) >= 0)
488	encode_uint (enc, 0x00, SvIVX (sv));	588	encode_uint (enc, MAJOR_POS_INT, SvIVX (sv));
489	else	589	else
490	encode_uint (enc, 0x20, -(SvIVX (sv) + 1));	590	encode_uint (enc, MAJOR_NEG_INT, -(SvIVX (sv) + 1));
491	}	591	}
492	else if (SvROK (sv))	592	else if (SvROK (sv))
493	encode_rv (enc, SvRV (sv));	593	encode_rv (enc, SvRV (sv));
494	else if (!SvOK (sv))	594	else if (!SvOK (sv))
495	encode_ch (enc, 0xe0 \| 22);	595	encode_ch (enc, MAJOR_MISC \| SIMPLE_NULL);
496	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)	596	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
497	encode_ch (enc, 0xe0 \| 23);	597	encode_ch (enc, MAJOR_MISC \| SIMPLE_UNDEF);
498	else	598	else
499	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",
500	SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));	600	SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
501	}	601	}
502		602
503	static SV *	603	static SV *
504	encode_cbor (SV scalar, CBOR cbor)	604	encode_cbor (SV scalar, CBOR cbor)
505	{	605	{
506	enc_t enc = { };	606	enc_t enc = { 0 };
507		607
508	enc.cbor = *cbor;	608	enc.cbor = *cbor;
509	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	609	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
510	enc.cur = SvPVX (enc.sv);	610	enc.cur = SvPVX (enc.sv);
511	enc.end = SvEND (enc.sv);	611	enc.end = SvEND (enc.sv);
512		612
513	SvPOK_only (enc.sv);	613	SvPOK_only (enc.sv);
514		614
515	if (cbor->flags & F_ALLOW_STRINGREF)	615	if (cbor->flags & F_PACK_STRINGS)
516	{	616	{
517	encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE);	617	encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE);
518	enc.stringref[0]= (HV )sv_2mortal ((SV )newHV ());	618	enc.stringref[0]= (HV )sv_2mortal ((SV )newHV ());
519	enc.stringref[1]= (HV )sv_2mortal ((SV )newHV ());	619	enc.stringref[1]= (HV )sv_2mortal ((SV )newHV ());
520	}	620	}
…		…
542	CBOR cbor;	642	CBOR cbor;
543	U32 depth; // recursion depth	643	U32 depth; // recursion depth
544	U32 maxdepth; // recursion depth limit	644	U32 maxdepth; // recursion depth limit
545	AV *shareable;	645	AV *shareable;
546	AV *stringref;	646	AV *stringref;
		647	SV *decode_tagged;
547	} dec_t;	648	} dec_t;
548		649
549	#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
550		651
551	#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")
…		…
554	#define DEC_DEC_DEPTH --dec->depth	655	#define DEC_DEC_DEPTH --dec->depth
555		656
556	static UV	657	static UV
557	decode_uint (dec_t *dec)	658	decode_uint (dec_t *dec)
558	{	659	{
559	switch (*dec->cur & 31)	660	U8 m = *dec->cur & MINOR_MASK;
560	{	661	++dec->cur;
561	case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:
562	case 8: case 9: case 10: case 11: case 12: case 13: case 14: case 15:
563	case 16: case 17: case 18: case 19: case 20: case 21: case 22: case 23:
564	return *dec->cur++ & 31;
565		662
566	case 24:	663	if (ecb_expect_true (m < LENGTH_EXT1))
		664	return m;
		665	else if (ecb_expect_true (m == LENGTH_EXT1))
		666	{
567	WANT (2);	667	WANT (1);
568	dec->cur += 2;	668	dec->cur += 1;
569	return dec->cur[-1];	669	return dec->cur[-1];
570		670	}
571	case 25:	671	else if (ecb_expect_true (m == LENGTH_EXT2))
		672	{
572	WANT (3);	673	WANT (2);
573	dec->cur += 3;	674	dec->cur += 2;
574	return (((UV)dec->cur[-2]) << 8)	675	return (((UV)dec->cur[-2]) << 8)
575	\| ((UV)dec->cur[-1]);	676	\| ((UV)dec->cur[-1]);
576		677	}
577	case 26:	678	else if (ecb_expect_true (m == LENGTH_EXT4))
		679	{
578	WANT (5);	680	WANT (4);
579	dec->cur += 5;	681	dec->cur += 4;
580	return (((UV)dec->cur[-4]) << 24)	682	return (((UV)dec->cur[-4]) << 24)
581	\| (((UV)dec->cur[-3]) << 16)	683	\| (((UV)dec->cur[-3]) << 16)
582	\| (((UV)dec->cur[-2]) << 8)	684	\| (((UV)dec->cur[-2]) << 8)
583	\| ((UV)dec->cur[-1]);	685	\| ((UV)dec->cur[-1]);
584		686	}
585	case 27:	687	else if (ecb_expect_true (m == LENGTH_EXT8))
		688	{
586	WANT (9);	689	WANT (8);
587	dec->cur += 9;	690	dec->cur += 8;
		691
		692	return
		693	#if UVSIZE < 8
		694	0
		695	#else
588	return (((UV)dec->cur[-8]) << 56)	696	(((UV)dec->cur[-8]) << 56)
589	\| (((UV)dec->cur[-7]) << 48)	697	\| (((UV)dec->cur[-7]) << 48)
590	\| (((UV)dec->cur[-6]) << 40)	698	\| (((UV)dec->cur[-6]) << 40)
591	\| (((UV)dec->cur[-5]) << 32)	699	\| (((UV)dec->cur[-5]) << 32)
		700	#endif
592	\| (((UV)dec->cur[-4]) << 24)	701	\| (((UV)dec->cur[-4]) << 24)
593	\| (((UV)dec->cur[-3]) << 16)	702	\| (((UV)dec->cur[-3]) << 16)
594	\| (((UV)dec->cur[-2]) << 8)	703	\| (((UV)dec->cur[-2]) << 8)
595	\| ((UV)dec->cur[-1]);	704	\| ((UV)dec->cur[-1]);
596		705	}
597	default:	706	else
598	ERR ("corrupted CBOR data (unsupported integer minor encoding)");	707	ERR ("corrupted CBOR data (unsupported integer minor encoding)");
599	}
600		708
601	fail:	709	fail:
602	return 0;	710	return 0;
603	}	711	}
604		712
…		…
609	{	717	{
610	AV *av = newAV ();	718	AV *av = newAV ();
611		719
612	DEC_INC_DEPTH;	720	DEC_INC_DEPTH;
613		721
614	if ((*dec->cur & 31) == 31)	722	if (*dec->cur == (MAJOR_ARRAY \| MINOR_INDEF))
615	{	723	{
616	++dec->cur;	724	++dec->cur;
617		725
618	for (;;)	726	for (;;)
619	{	727	{
620	WANT (1);	728	WANT (1);
621		729
622	if (*dec->cur == (0xe0 \| 31))	730	if (*dec->cur == (MAJOR_MISC \| MINOR_INDEF))
623	{	731	{
624	++dec->cur;	732	++dec->cur;
625	break;	733	break;
626	}	734	}
627		735
…		…
630	}	738	}
631	else	739	else
632	{	740	{
633	int i, len = decode_uint (dec);	741	int i, len = decode_uint (dec);
634		742
		743	WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays
635	av_fill (av, len - 1);	744	av_fill (av, len - 1);
636		745
637	for (i = 0; i < len; ++i)	746	for (i = 0; i < len; ++i)
638	AvARRAY (av)[i] = decode_sv (dec);	747	AvARRAY (av)[i] = decode_sv (dec);
639	}	748	}
…		…
652	{	761	{
653	// for speed reasons, we specialcase single-string	762	// for speed reasons, we specialcase single-string
654	// byte or utf-8 strings as keys, but only when !stringref	763	// byte or utf-8 strings as keys, but only when !stringref
655		764
656	if (ecb_expect_true (!dec->stringref))	765	if (ecb_expect_true (!dec->stringref))
657	if (dec->cur >= 0x40 && dec->cur <= 0x40 + 27)	766	if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
658	{	767	{
659	I32 len = decode_uint (dec);	768	I32 len = decode_uint (dec);
660	char key = (char )dec->cur;	769	char key = (char )dec->cur;
661		770
		771	WANT (len);
662	dec->cur += len;	772	dec->cur += len;
663		773
664	if (ecb_expect_false (dec->stringref))
665	av_push (dec->stringref, newSVpvn (key, len));
666
667	hv_store (hv, key, len, decode_sv (dec), 0);	774	hv_store (hv, key, len, decode_sv (dec), 0);
668		775
669	return;	776	return;
670	}	777	}
671	else if (dec->cur >= 0x60 && dec->cur <= 0x60 + 27)	778	else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8))
672	{	779	{
673	I32 len = decode_uint (dec);	780	I32 len = decode_uint (dec);
674	char key = (char )dec->cur;	781	char key = (char )dec->cur;
675		782
		783	WANT (len);
676	dec->cur += len;	784	dec->cur += len;
677		785
678	if (ecb_expect_false (dec->stringref))	786	if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
679	av_push (dec->stringref, newSVpvn_utf8 (key, len, 1));	787	if (!is_utf8_string (key, len))
		788	ERR ("corrupted CBOR data (invalid UTF-8 in map key)");
680		789
681	hv_store (hv, key, -len, decode_sv (dec), 0);	790	hv_store (hv, key, -len, decode_sv (dec), 0);
682		791
683	return;	792	return;
684	}	793	}
…		…
686	SV *k = decode_sv (dec);	795	SV *k = decode_sv (dec);
687	SV *v = decode_sv (dec);	796	SV *v = decode_sv (dec);
688		797
689	hv_store_ent (hv, k, v, 0);	798	hv_store_ent (hv, k, v, 0);
690	SvREFCNT_dec (k);	799	SvREFCNT_dec (k);
		800
		801	fail:
		802	;
691	}	803	}
692		804
693	static SV *	805	static SV *
694	decode_hv (dec_t *dec)	806	decode_hv (dec_t *dec)
695	{	807	{
696	HV *hv = newHV ();	808	HV *hv = newHV ();
697		809
698	DEC_INC_DEPTH;	810	DEC_INC_DEPTH;
699		811
700	if ((*dec->cur & 31) == 31)	812	if (*dec->cur == (MAJOR_MAP \| MINOR_INDEF))
701	{	813	{
702	++dec->cur;	814	++dec->cur;
703		815
704	for (;;)	816	for (;;)
705	{	817	{
706	WANT (1);	818	WANT (1);
707		819
708	if (*dec->cur == (0xe0 \| 31))	820	if (*dec->cur == (MAJOR_MISC \| MINOR_INDEF))
709	{	821	{
710	++dec->cur;	822	++dec->cur;
711	break;	823	break;
712	}	824	}
713		825
…		…
734	static SV *	846	static SV *
735	decode_str (dec_t *dec, int utf8)	847	decode_str (dec_t *dec, int utf8)
736	{	848	{
737	SV *sv = 0;	849	SV *sv = 0;
738		850
739	if ((*dec->cur & 31) == 31)	851	if ((*dec->cur & MINOR_MASK) == MINOR_INDEF)
740	{	852	{
		853	// indefinite length strings
741	++dec->cur;	854	++dec->cur;
742		855
		856	U8 major = *dec->cur & MAJOR_MISC;
		857
743	sv = newSVpvn ("", 0);	858	sv = newSVpvn ("", 0);
744		859
745	// not very fast, and certainly not robust against illegal input
746	for (;;)	860	for (;;)
747	{	861	{
748	WANT (1);	862	WANT (1);
749		863
750	if (*dec->cur == (0xe0 \| 31))	864	if ((*dec->cur - major) > LENGTH_EXT8)
		865	if (*dec->cur == (MAJOR_MISC \| MINOR_INDEF))
751	{	866	{
752	++dec->cur;	867	++dec->cur;
753	break;	868	break;
754	}	869	}
		870	else
		871	ERR ("corrupted CBOR data (invalid chunks in indefinite length string)");
755		872
756	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;
757	}	878	}
758	}	879	}
759	else	880	else
760	{	881	{
761	STRLEN len = decode_uint (dec);	882	STRLEN len = decode_uint (dec);
…		…
768	&& SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1))	889	&& SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1))
769	av_push (dec->stringref, SvREFCNT_inc_NN (sv));	890	av_push (dec->stringref, SvREFCNT_inc_NN (sv));
770	}	891	}
771		892
772	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
773	SvUTF8_on (sv);	899	SvUTF8_on (sv);
		900	}
774		901
775	return sv;	902	return sv;
776		903
777	fail:	904	fail:
778	SvREFCNT_dec (sv);	905	SvREFCNT_dec (sv);
…		…
810	}	937	}
811	break;	938	break;
812		939
813	case CBOR_TAG_STRINGREF:	940	case CBOR_TAG_STRINGREF:
814	{	941	{
815	if ((*dec->cur >> 5) != 0)	942	if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
816	ERR ("corrupted CBOR data (stringref index not an unsigned integer)");	943	ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
817		944
818	UV idx = decode_uint (dec);	945	UV idx = decode_uint (dec);
819		946
820	if (!dec->stringref \|\| (int)idx > AvFILLp (dec->stringref))	947	if (!dec->stringref \|\| (int)idx > AvFILLp (dec->stringref))
…		…
827	case CBOR_TAG_VALUE_SHAREABLE:	954	case CBOR_TAG_VALUE_SHAREABLE:
828	{	955	{
829	if (ecb_expect_false (!dec->shareable))	956	if (ecb_expect_false (!dec->shareable))
830	dec->shareable = (AV )sv_2mortal ((SV )newAV ());	957	dec->shareable = (AV )sv_2mortal ((SV )newAV ());
831		958
		959	if (dec->cbor.flags & F_ALLOW_CYCLES)
		960	{
832	sv = newSV (0);	961	sv = newSV (0);
833	av_push (dec->shareable, SvREFCNT_inc_NN (sv));	962	av_push (dec->shareable, SvREFCNT_inc_NN (sv));
834		963
835	SV *osv = decode_sv (dec);	964	SV *osv = decode_sv (dec);
836	sv_setsv (sv, osv);	965	sv_setsv (sv, osv);
837	SvREFCNT_dec_NN (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	}
838	}	975	}
839	break;	976	break;
840		977
841	case CBOR_TAG_VALUE_SHAREDREF:	978	case CBOR_TAG_VALUE_SHAREDREF:
842	{	979	{
843	if ((*dec->cur >> 5) != 0)	980	if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
844	ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");	981	ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
845		982
846	UV idx = decode_uint (dec);	983	UV idx = decode_uint (dec);
847		984
848	if (!dec->shareable \|\| (int)idx > AvFILLp (dec->shareable))	985	if (!dec->shareable \|\| (int)idx > AvFILLp (dec->shareable))
849	ERR ("corrupted CBOR data (sharedref index out of bounds)");	986	ERR ("corrupted CBOR data (sharedref index out of bounds)");
850		987
851	sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);	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");
852	}	992	}
853	break;	993	break;
854		994
855	case CBOR_TAG_PERL_OBJECT:	995	case CBOR_TAG_PERL_OBJECT:
856	{	996	{
…		…
871	if (!method)	1011	if (!method)
872	ERR ("cannot decode perl-object (package does not have a THAW method)");	1012	ERR ("cannot decode perl-object (package does not have a THAW method)");
873		1013
874	dSP;	1014	dSP;
875		1015
876	ENTER; SAVETMPS; PUSHMARK (SP);	1016	ENTER; SAVETMPS;
		1017	PUSHMARK (SP);
877	EXTEND (SP, len + 1);	1018	EXTEND (SP, len + 1);
878	// we re-bless the reference to get overload and other niceties right	1019	// we re-bless the reference to get overload and other niceties right
879	PUSHs (*av_fetch (av, 0, 1));	1020	PUSHs (*av_fetch (av, 0, 1));
880	PUSHs (sv_cbor);	1021	PUSHs (sv_cbor);
881		1022
…		…
905		1046
906	default:	1047	default:
907	{	1048	{
908	sv = decode_sv (dec);	1049	sv = decode_sv (dec);
909		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	{
910	AV *av = newAV ();	1076	AV *av = newAV ();
911	av_push (av, newSVuv (tag));	1077	av_push (av, newSVuv (tag));
912	av_push (av, sv);	1078	av_push (av, sv);
913		1079
914	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash	1080	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
915	? cbor_tagged_stash	1081	? cbor_tagged_stash
916	: gv_stashpv ("CBOR::XS::Tagged" , 1);	1082	: gv_stashpv ("CBOR::XS::Tagged" , 1);
917
918	sv = 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;
919	}	1089	}
920	break;	1090	break;
921	}	1091	}
922		1092
923	return sv;	1093	return sv;
…		…
930	static SV *	1100	static SV *
931	decode_sv (dec_t *dec)	1101	decode_sv (dec_t *dec)
932	{	1102	{
933	WANT (1);	1103	WANT (1);
934		1104
935	switch (*dec->cur >> 5)	1105	switch (*dec->cur >> MAJOR_SHIFT)
936	{	1106	{
937	case 0: // unsigned int	1107	case MAJOR_POS_INT >> MAJOR_SHIFT: return newSVuv (decode_uint (dec));
938	return newSVuv (decode_uint (dec));	1108	case MAJOR_NEG_INT >> MAJOR_SHIFT: return newSViv (-1 - (IV)decode_uint (dec));
939	case 1: // negative int	1109	case MAJOR_BYTES >> MAJOR_SHIFT: return decode_str (dec, 0);
940	return newSViv (-1 - (IV)decode_uint (dec));	1110	case MAJOR_TEXT >> MAJOR_SHIFT: return decode_str (dec, 1);
941	case 2: // octet string	1111	case MAJOR_ARRAY >> MAJOR_SHIFT: return decode_av (dec);
942	return decode_str (dec, 0);	1112	case MAJOR_MAP >> MAJOR_SHIFT: return decode_hv (dec);
943	case 3: // utf-8 string	1113	case MAJOR_TAG >> MAJOR_SHIFT: return decode_tagged (dec);
944	return decode_str (dec, 1);	1114
945	case 4: // array	1115	case MAJOR_MISC >> MAJOR_SHIFT:
946	return decode_av (dec);
947	case 5: // map
948	return decode_hv (dec);
949	case 6: // tag
950	return decode_tagged (dec);
951	case 7: // misc
952	switch (*dec->cur++ & 31)	1116	switch (*dec->cur++ & MINOR_MASK)
953	{	1117	{
954	case 20:	1118	case SIMPLE_FALSE:
955	#if CBOR_SLOW	1119	#if CBOR_SLOW
956	types_false = get_bool ("Types::Serialiser::false");	1120	types_false = get_bool ("Types::Serialiser::false");
957	#endif	1121	#endif
958	return newSVsv (types_false);	1122	return newSVsv (types_false);
959	case 21:	1123	case SIMPLE_TRUE:
960	#if CBOR_SLOW	1124	#if CBOR_SLOW
961	types_true = get_bool ("Types::Serialiser::true");	1125	types_true = get_bool ("Types::Serialiser::true");
962	#endif	1126	#endif
963	return newSVsv (types_true);	1127	return newSVsv (types_true);
964	case 22:	1128	case SIMPLE_NULL:
965	return newSVsv (&PL_sv_undef);	1129	return newSVsv (&PL_sv_undef);
966	case 23:	1130	case SIMPLE_UNDEF:
967	#if CBOR_SLOW	1131	#if CBOR_SLOW
968	types_error = get_bool ("Types::Serialiser::error");	1132	types_error = get_bool ("Types::Serialiser::error");
969	#endif	1133	#endif
970	return newSVsv (types_error);	1134	return newSVsv (types_error);
971		1135
972	case 25:	1136	case MISC_FLOAT16:
973	{	1137	{
974	WANT (2);	1138	WANT (2);
975		1139
976	uint16_t fp = (dec->cur[0] << 8) \| dec->cur[1];	1140	uint16_t fp = (dec->cur[0] << 8) \| dec->cur[1];
977	dec->cur += 2;	1141	dec->cur += 2;
978		1142
979	return newSVnv (ecb_binary16_to_float (fp));	1143	return newSVnv (ecb_binary16_to_float (fp));
980	}	1144	}
981		1145
982	case 26:	1146	case MISC_FLOAT32:
983	{	1147	{
984	uint32_t fp;	1148	uint32_t fp;
985	WANT (4);	1149	WANT (4);
986	memcpy (&fp, dec->cur, 4);	1150	memcpy (&fp, dec->cur, 4);
987	dec->cur += 4;	1151	dec->cur += 4;
…		…
990	fp = ecb_bswap32 (fp);	1154	fp = ecb_bswap32 (fp);
991		1155
992	return newSVnv (ecb_binary32_to_float (fp));	1156	return newSVnv (ecb_binary32_to_float (fp));
993	}	1157	}
994		1158
995	case 27:	1159	case MISC_FLOAT64:
996	{	1160	{
997	uint64_t fp;	1161	uint64_t fp;
998	WANT (8);	1162	WANT (8);
999	memcpy (&fp, dec->cur, 8);	1163	memcpy (&fp, dec->cur, 8);
1000	dec->cur += 8;	1164	dec->cur += 8;
…		…
1003	fp = ecb_bswap64 (fp);	1167	fp = ecb_bswap64 (fp);
1004		1168
1005	return newSVnv (ecb_binary64_to_double (fp));	1169	return newSVnv (ecb_binary64_to_double (fp));
1006	}	1170	}
1007		1171
1008	// 0..19 unassigned	1172	// 0..19 unassigned simple
1009	// 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
1010	default:	1176	default:
1011	ERR ("corrupted CBOR data (reserved/unassigned major 7 value)");	1177	ERR ("corrupted CBOR data (reserved/unassigned/unexpected major 7 value)");
1012	}	1178	}
1013		1179
1014	break;	1180	break;
1015	}	1181	}
1016		1182
…		…
1019	}	1185	}
1020		1186
1021	static SV *	1187	static SV *
1022	decode_cbor (SV string, CBOR cbor, char **offset_return)	1188	decode_cbor (SV string, CBOR cbor, char **offset_return)
1023	{	1189	{
1024	dec_t dec = { };	1190	dec_t dec = { 0 };
1025	SV *sv;	1191	SV *sv;
1026	STRLEN len;	1192	STRLEN len;
1027	char *data = SvPVbyte (string, len);	1193	char *data = SvPVbyte (string, len);
1028		1194
1029	if (len > cbor->max_size && cbor->max_size)	1195	if (len > cbor->max_size && cbor->max_size)
…		…
1043	if (dec.cur != dec.end && !dec.err)	1209	if (dec.cur != dec.end && !dec.err)
1044	dec.err = "garbage after CBOR object";	1210	dec.err = "garbage after CBOR object";
1045		1211
1046	if (dec.err)	1212	if (dec.err)
1047	{	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
1048	SvREFCNT_dec (sv);	1225	SvREFCNT_dec (sv);
1049	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);
1050	}	1227	}
1051		1228
1052	sv = sv_2mortal (sv);	1229	sv = sv_2mortal (sv);
1053		1230
1054	return sv;	1231	return sv;
1055	}	1232	}
1056		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
1057	/////////////////////////////////////////////////////////////////////////////	1358	/////////////////////////////////////////////////////////////////////////////
1058	// XS interface functions	1359	// XS interface functions
1059		1360
1060	MODULE = CBOR::XS PACKAGE = CBOR::XS	1361	MODULE = CBOR::XS PACKAGE = CBOR::XS
1061		1362
…		…
1068	types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);	1369	types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);
1069		1370
1070	types_true = get_bool ("Types::Serialiser::true" );	1371	types_true = get_bool ("Types::Serialiser::true" );
1071	types_false = get_bool ("Types::Serialiser::false");	1372	types_false = get_bool ("Types::Serialiser::false");
1072	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);
1073		1376
1074	sv_cbor = newSVpv ("CBOR", 0);	1377	sv_cbor = newSVpv ("CBOR", 0);
1075	SvREADONLY_on (sv_cbor);	1378	SvREADONLY_on (sv_cbor);
1076	}	1379	}
1077		1380
…		…
1099	void shrink (CBOR *self, int enable = 1)	1402	void shrink (CBOR *self, int enable = 1)
1100	ALIAS:	1403	ALIAS:
1101	shrink = F_SHRINK	1404	shrink = F_SHRINK
1102	allow_unknown = F_ALLOW_UNKNOWN	1405	allow_unknown = F_ALLOW_UNKNOWN
1103	allow_sharing = F_ALLOW_SHARING	1406	allow_sharing = F_ALLOW_SHARING
1104	allow_stringref = F_ALLOW_STRINGREF	1407	allow_cycles = F_ALLOW_CYCLES
		1408	pack_strings = F_PACK_STRINGS
		1409	utf8_strings = F_UTF8_STRINGS
		1410	validate_utf8 = F_VALIDATE_UTF8
1105	PPCODE:	1411	PPCODE:
1106	{	1412	{
1107	if (enable)	1413	if (enable)
1108	self->flags \|= ix;	1414	self->flags \|= ix;
1109	else	1415	else
…		…
1115	void get_shrink (CBOR *self)	1421	void get_shrink (CBOR *self)
1116	ALIAS:	1422	ALIAS:
1117	get_shrink = F_SHRINK	1423	get_shrink = F_SHRINK
1118	get_allow_unknown = F_ALLOW_UNKNOWN	1424	get_allow_unknown = F_ALLOW_UNKNOWN
1119	get_allow_sharing = F_ALLOW_SHARING	1425	get_allow_sharing = F_ALLOW_SHARING
1120	get_allow_stringref = F_ALLOW_STRINGREF	1426	get_allow_cycles = F_ALLOW_CYCLES
		1427	get_pack_strings = F_PACK_STRINGS
		1428	get_validate_utf8 = F_VALIDATE_UTF8
1121	PPCODE:	1429	PPCODE:
1122	XPUSHs (boolSV (self->flags & ix));	1430	XPUSHs (boolSV (self->flags & ix));
1123		1431
1124	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)	1432	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
1125	PPCODE:	1433	PPCODE:
…		…
1138	XPUSHs (ST (0));	1446	XPUSHs (ST (0));
1139		1447
1140	int get_max_size (CBOR *self)	1448	int get_max_size (CBOR *self)
1141	CODE:	1449	CODE:
1142	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);
1143	OUTPUT:	1463	OUTPUT:
1144	RETVAL	1464	RETVAL
1145		1465
1146	void encode (CBOR self, SV scalar)	1466	void encode (CBOR self, SV scalar)
1147	PPCODE:	1467	PPCODE:
…		…
1162	EXTEND (SP, 2);	1482	EXTEND (SP, 2);
1163	PUSHs (sv);	1483	PUSHs (sv);
1164	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));	1484	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1165	}	1485	}
1166		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
1167	PROTOTYPES: ENABLE	1543	PROTOTYPES: ENABLE
1168		1544
1169	void encode_cbor (SV *scalar)	1545	void encode_cbor (SV *scalar)
		1546	ALIAS:
		1547	encode_cbor = 0
		1548	encode_cbor_sharing = F_ALLOW_SHARING
1170	PPCODE:	1549	PPCODE:
1171	{	1550	{
1172	CBOR cbor;	1551	CBOR cbor;
1173	cbor_init (&cbor);	1552	cbor_init (&cbor);
		1553	cbor.flags \|= ix;
1174	PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN;	1554	PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN;
1175	XPUSHs (scalar);	1555	XPUSHs (scalar);
1176	}	1556	}
1177		1557
1178	void decode_cbor (SV *cborstr)	1558	void decode_cbor (SV *cborstr)

Diff Legend

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

Comparing CBOR-XS/XS.xs (file contents): Revision 1.26 by root, Fri Nov 22 09:40:13 2013 UTC vs. Revision 1.51 by root, Sun Apr 24 13:15:19 2016 UTC

Diff Legend

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.26 by root, Fri Nov 22 09:40:13 2013 UTC vs.
Revision 1.51 by root, Sun Apr 24 13:15:19 2016 UTC