[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.50 by root, Thu Feb 25 02:29:22 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
		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
		329	if (SvMAGICAL (av))
233	for (i = 0; i <= len; ++i)	330	for (i = 0; i <= len; ++i)
234	{	331	{
235	SV **svp = av_fetch (av, i, 0);	332	SV **svp = av_fetch (av, i, 0);
236	encode_sv (enc, svp ? *svp : &PL_sv_undef);	333	encode_sv (enc, svp ? *svp : &PL_sv_undef);
237	}	334	}
		335	else
		336	for (i = 0; i <= len; ++i)
		337	{
		338	SV *sv = AvARRAY (av)[i];
		339	encode_sv (enc, sv ? sv : &PL_sv_undef);
		340	}
238		341
239	--enc->depth;	342	--enc->depth;
240	}	343	}
241		344
242	static void	345	static void
…		…
251		354
252	int pairs = hv_iterinit (hv);	355	int pairs = hv_iterinit (hv);
253	int mg = SvMAGICAL (hv);	356	int mg = SvMAGICAL (hv);
254		357
255	if (mg)	358	if (mg)
256	encode_ch (enc, 0xa0 \| 31);	359	encode_ch (enc, MAJOR_MAP \| MINOR_INDEF);
257	else	360	else
258	encode_uint (enc, 0xa0, pairs);	361	encode_uint (enc, MAJOR_MAP, pairs);
259		362
260	while ((he = hv_iternext (hv)))	363	while ((he = hv_iternext (hv)))
261	{	364	{
262	if (HeKLEN (he) == HEf_SVKEY)	365	if (HeKLEN (he) == HEf_SVKEY)
263	encode_sv (enc, HeSVKEY (he));	366	encode_sv (enc, HeSVKEY (he));
264	else	367	else
265	encode_str (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));	368	encode_strref (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));
266		369
267	encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));	370	encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));
268	}	371	}
269		372
270	if (mg)	373	if (mg)
271	encode_ch (enc, 0xe0 \| 31);	374	encode_ch (enc, MAJOR_MISC \| MINOR_INDEF);
272		375
273	--enc->depth;	376	--enc->depth;
274	}	377	}
275		378
276	// encode objects, arrays and special \0=false and \1=true values.	379	// encode objects, arrays and special \0=false and \1=true values.
277	static void	380	static void
278	encode_rv (enc_t enc, SV sv)	381	encode_rv (enc_t enc, SV sv)
279	{	382	{
280	SvGETMAGIC (sv);	383	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		384
304	svtype svt = SvTYPE (sv);	385	svtype svt = SvTYPE (sv);
305		386
306	if (ecb_expect_false (SvOBJECT (sv)))	387	if (ecb_expect_false (SvOBJECT (sv)))
307	{	388	{
…		…
314	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash	395	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
315	? cbor_tagged_stash	396	? cbor_tagged_stash
316	: gv_stashpv ("CBOR::XS::Tagged" , 1);	397	: gv_stashpv ("CBOR::XS::Tagged" , 1);
317		398
318	HV *stash = SvSTASH (sv);	399	HV *stash = SvSTASH (sv);
319	GV *method;
320		400
321	if (stash == boolean_stash)	401	if (stash == boolean_stash)
322	encode_ch (enc, SvIV (sv) ? 0xe0 \| 21 : 0xe0 \| 20);	402	{
		403	encode_ch (enc, SvIV (sv) ? MAJOR_MISC \| SIMPLE_TRUE : MAJOR_MISC \| SIMPLE_FALSE);
		404	return;
		405	}
323	else if (stash == error_stash)	406	else if (stash == error_stash)
324	encode_ch (enc, 0xe0 \| 23);	407	{
		408	encode_ch (enc, MAJOR_MISC \| SIMPLE_UNDEF);
		409	return;
		410	}
325	else if (stash == tagged_stash)	411	else if (stash == tagged_stash)
326	{	412	{
327	if (svt != SVt_PVAV)	413	if (svt != SVt_PVAV)
328	croak ("encountered CBOR::XS::Tagged object that isn't an array");	414	croak ("encountered CBOR::XS::Tagged object that isn't an array");
329		415
330	encode_uint (enc, 0xc0, SvUV (av_fetch ((AV )sv, 0, 1)));	416	encode_uint (enc, MAJOR_TAG, SvUV (av_fetch ((AV )sv, 0, 1)));
331	encode_sv (enc, av_fetch ((AV )sv, 1, 1));	417	encode_sv (enc, av_fetch ((AV )sv, 1, 1));
		418
		419	return;
		420	}
		421	}
		422
		423	if (ecb_expect_false (SvREFCNT (sv) > 1)
		424	&& ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING))
		425	{
		426	if (!enc->shareable)
		427	enc->shareable = (HV )sv_2mortal ((SV )newHV ());
		428
		429	SV *svp = hv_fetch (enc->shareable, (char )&sv, sizeof (sv), 1);
		430
		431	if (SvOK (*svp))
332	}	432	{
		433	encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
		434	encode_uint (enc, MAJOR_POS_INT, SvUV (*svp));
		435	return;
		436	}
		437	else
		438	{
		439	sv_setuv (*svp, enc->shareable_idx);
		440	++enc->shareable_idx;
		441	encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
		442	}
		443	}
		444
		445	if (ecb_expect_false (SvOBJECT (sv)))
		446	{
		447	HV *stash = SvSTASH (sv);
		448	GV *method;
		449
333	else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))	450	if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
334	{	451	{
335	dSP;	452	dSP;
336		453
337	ENTER; SAVETMPS; PUSHMARK (SP);	454	ENTER; SAVETMPS;
		455	PUSHMARK (SP);
338	// we re-bless the reference to get overload and other niceties right	456	// we re-bless the reference to get overload and other niceties right
339	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));	457	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
340		458
341	PUTBACK;	459	PUTBACK;
342	// G_SCALAR ensures that return value is 1	460	// G_SCALAR ensures that return value is 1
…		…
355	}	473	}
356	else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)	474	else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
357	{	475	{
358	dSP;	476	dSP;
359		477
360	ENTER; SAVETMPS; PUSHMARK (SP);	478	ENTER; SAVETMPS;
		479	SAVESTACK_POS ();
		480	PUSHMARK (SP);
361	EXTEND (SP, 2);	481	EXTEND (SP, 2);
362	// we re-bless the reference to get overload and other niceties right	482	// we re-bless the reference to get overload and other niceties right
363	PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));	483	PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
364	PUSHs (sv_cbor);	484	PUSHs (sv_cbor);
365		485
…		…
370	// catch this surprisingly common error	490	// catch this surprisingly common error
371	if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)	491	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));	492	croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
373		493
374	encode_tag (enc, CBOR_TAG_PERL_OBJECT);	494	encode_tag (enc, CBOR_TAG_PERL_OBJECT);
375	encode_uint (enc, 0x80, count + 1);	495	encode_uint (enc, MAJOR_ARRAY, count + 1);
376	encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));	496	encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
377		497
378	while (count)	498	while (count)
379	encode_sv (enc, SP[1 - count--]);	499	encode_sv (enc, SP[1 - count--]);
380		500
381	PUTBACK;	501	PUTBACK;
…		…
402	{	522	{
403	double nv = SvNVX (sv);	523	double nv = SvNVX (sv);
404		524
405	need (enc, 9);	525	need (enc, 9);
406		526
407	if (ecb_expect_false (nv == (U32)nv))	527	if (ecb_expect_false (nv == (NV)(U32)nv))
408	encode_uint (enc, 0x00, (U32)nv);	528	encode_uint (enc, MAJOR_POS_INT, (U32)nv);
409	//TODO: maybe I32?	529	//TODO: maybe I32?
410	else if (ecb_expect_false (nv == (float)nv))	530	else if (ecb_expect_false (nv == (float)nv))
411	{	531	{
412	uint32_t fp = ecb_float_to_binary32 (nv);	532	uint32_t fp = ecb_float_to_binary32 (nv);
413		533
414	*enc->cur++ = 0xe0 \| 26;	534	*enc->cur++ = MAJOR_MISC \| MISC_FLOAT32;
415		535
416	if (!ecb_big_endian ())	536	if (!ecb_big_endian ())
417	fp = ecb_bswap32 (fp);	537	fp = ecb_bswap32 (fp);
418		538
419	memcpy (enc->cur, &fp, 4);	539	memcpy (enc->cur, &fp, 4);
…		…
421	}	541	}
422	else	542	else
423	{	543	{
424	uint64_t fp = ecb_double_to_binary64 (nv);	544	uint64_t fp = ecb_double_to_binary64 (nv);
425		545
426	*enc->cur++ = 0xe0 \| 27;	546	*enc->cur++ = MAJOR_MISC \| MISC_FLOAT64;
427		547
428	if (!ecb_big_endian ())	548	if (!ecb_big_endian ())
429	fp = ecb_bswap64 (fp);	549	fp = ecb_bswap64 (fp);
430		550
431	memcpy (enc->cur, &fp, 8);	551	memcpy (enc->cur, &fp, 8);
…		…
440		560
441	if (SvPOKp (sv))	561	if (SvPOKp (sv))
442	{	562	{
443	STRLEN len;	563	STRLEN len;
444	char *str = SvPV (sv, len);	564	char *str = SvPV (sv, len);
445	encode_str (enc, SvUTF8 (sv), str, len);	565	encode_strref (enc, SvUTF8 (sv), str, len);
446	}	566	}
447	else if (SvNOKp (sv))	567	else if (SvNOKp (sv))
448	encode_nv (enc, sv);	568	encode_nv (enc, sv);
449	else if (SvIOKp (sv))	569	else if (SvIOKp (sv))
450	{	570	{
451	if (SvIsUV (sv))	571	if (SvIsUV (sv))
452	encode_uint (enc, 0x00, SvUVX (sv));	572	encode_uint (enc, MAJOR_POS_INT, SvUVX (sv));
453	else if (SvIVX (sv) >= 0)	573	else if (SvIVX (sv) >= 0)
454	encode_uint (enc, 0x00, SvIVX (sv));	574	encode_uint (enc, MAJOR_POS_INT, SvIVX (sv));
455	else	575	else
456	encode_uint (enc, 0x20, -(SvIVX (sv) + 1));	576	encode_uint (enc, MAJOR_NEG_INT, -(SvIVX (sv) + 1));
457	}	577	}
458	else if (SvROK (sv))	578	else if (SvROK (sv))
459	encode_rv (enc, SvRV (sv));	579	encode_rv (enc, SvRV (sv));
460	else if (!SvOK (sv))	580	else if (!SvOK (sv))
461	encode_ch (enc, 0xe0 \| 22);	581	encode_ch (enc, MAJOR_MISC \| SIMPLE_NULL);
462	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)	582	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
463	encode_ch (enc, 0xe0 \| 23);	583	encode_ch (enc, MAJOR_MISC \| SIMPLE_UNDEF);
464	else	584	else
465	croak ("encountered perl type (%s,0x%x) that CBOR cannot handle, check your input data",	585	croak ("encountered perl type (%s,0x%x) that CBOR cannot handle, check your input data",
466	SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));	586	SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
467	}	587	}
468		588
469	static SV *	589	static SV *
470	encode_cbor (SV scalar, CBOR cbor)	590	encode_cbor (SV scalar, CBOR cbor)
471	{	591	{
472	enc_t enc = { };	592	enc_t enc = { 0 };
473		593
474	enc.cbor = *cbor;	594	enc.cbor = *cbor;
475	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	595	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
476	enc.cur = SvPVX (enc.sv);	596	enc.cur = SvPVX (enc.sv);
477	enc.end = SvEND (enc.sv);	597	enc.end = SvEND (enc.sv);
478		598
479	SvPOK_only (enc.sv);	599	SvPOK_only (enc.sv);
		600
		601	if (cbor->flags & F_PACK_STRINGS)
		602	{
		603	encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE);
		604	enc.stringref[0]= (HV )sv_2mortal ((SV )newHV ());
		605	enc.stringref[1]= (HV )sv_2mortal ((SV )newHV ());
		606	}
		607
480	encode_sv (&enc, scalar);	608	encode_sv (&enc, scalar);
481		609
482	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	610	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
483	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	611	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
484		612
…		…
499	const char *err; // parse error, if != 0	627	const char *err; // parse error, if != 0
500	CBOR cbor;	628	CBOR cbor;
501	U32 depth; // recursion depth	629	U32 depth; // recursion depth
502	U32 maxdepth; // recursion depth limit	630	U32 maxdepth; // recursion depth limit
503	AV *shareable;	631	AV *shareable;
		632	AV *stringref;
		633	SV *decode_tagged;
504	} dec_t;	634	} dec_t;
505		635
506	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE	636	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE
507		637
508	#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")	638	#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	641	#define DEC_DEC_DEPTH --dec->depth
512		642
513	static UV	643	static UV
514	decode_uint (dec_t *dec)	644	decode_uint (dec_t *dec)
515	{	645	{
516	switch (*dec->cur & 31)	646	U8 m = *dec->cur & MINOR_MASK;
517	{	647	++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		648
523	case 24:	649	if (ecb_expect_true (m < LENGTH_EXT1))
		650	return m;
		651	else if (ecb_expect_true (m == LENGTH_EXT1))
		652	{
524	WANT (2);	653	WANT (1);
525	dec->cur += 2;	654	dec->cur += 1;
526	return dec->cur[-1];	655	return dec->cur[-1];
527		656	}
528	case 25:	657	else if (ecb_expect_true (m == LENGTH_EXT2))
		658	{
529	WANT (3);	659	WANT (2);
530	dec->cur += 3;	660	dec->cur += 2;
531	return (((UV)dec->cur[-2]) << 8)	661	return (((UV)dec->cur[-2]) << 8)
532	\| ((UV)dec->cur[-1]);	662	\| ((UV)dec->cur[-1]);
533		663	}
534	case 26:	664	else if (ecb_expect_true (m == LENGTH_EXT4))
		665	{
535	WANT (5);	666	WANT (4);
536	dec->cur += 5;	667	dec->cur += 4;
537	return (((UV)dec->cur[-4]) << 24)	668	return (((UV)dec->cur[-4]) << 24)
538	\| (((UV)dec->cur[-3]) << 16)	669	\| (((UV)dec->cur[-3]) << 16)
539	\| (((UV)dec->cur[-2]) << 8)	670	\| (((UV)dec->cur[-2]) << 8)
540	\| ((UV)dec->cur[-1]);	671	\| ((UV)dec->cur[-1]);
541		672	}
542	case 27:	673	else if (ecb_expect_true (m == LENGTH_EXT8))
		674	{
543	WANT (9);	675	WANT (8);
544	dec->cur += 9;	676	dec->cur += 8;
		677
		678	return
		679	#if UVSIZE < 8
		680	0
		681	#else
545	return (((UV)dec->cur[-8]) << 56)	682	(((UV)dec->cur[-8]) << 56)
546	\| (((UV)dec->cur[-7]) << 48)	683	\| (((UV)dec->cur[-7]) << 48)
547	\| (((UV)dec->cur[-6]) << 40)	684	\| (((UV)dec->cur[-6]) << 40)
548	\| (((UV)dec->cur[-5]) << 32)	685	\| (((UV)dec->cur[-5]) << 32)
		686	#endif
549	\| (((UV)dec->cur[-4]) << 24)	687	\| (((UV)dec->cur[-4]) << 24)
550	\| (((UV)dec->cur[-3]) << 16)	688	\| (((UV)dec->cur[-3]) << 16)
551	\| (((UV)dec->cur[-2]) << 8)	689	\| (((UV)dec->cur[-2]) << 8)
552	\| ((UV)dec->cur[-1]);	690	\| ((UV)dec->cur[-1]);
553		691	}
554	default:	692	else
555	ERR ("corrupted CBOR data (unsupported integer minor encoding)");	693	ERR ("corrupted CBOR data (unsupported integer minor encoding)");
556	}
557		694
558	fail:	695	fail:
559	return 0;	696	return 0;
560	}	697	}
561		698
…		…
566	{	703	{
567	AV *av = newAV ();	704	AV *av = newAV ();
568		705
569	DEC_INC_DEPTH;	706	DEC_INC_DEPTH;
570		707
571	if ((*dec->cur & 31) == 31)	708	if (*dec->cur == (MAJOR_ARRAY \| MINOR_INDEF))
572	{	709	{
573	++dec->cur;	710	++dec->cur;
574		711
575	for (;;)	712	for (;;)
576	{	713	{
577	WANT (1);	714	WANT (1);
578		715
579	if (*dec->cur == (0xe0 \| 31))	716	if (*dec->cur == (MAJOR_MISC \| MINOR_INDEF))
580	{	717	{
581	++dec->cur;	718	++dec->cur;
582	break;	719	break;
583	}	720	}
584		721
…		…
587	}	724	}
588	else	725	else
589	{	726	{
590	int i, len = decode_uint (dec);	727	int i, len = decode_uint (dec);
591		728
		729	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);	730	av_fill (av, len - 1);
593		731
594	for (i = 0; i < len; ++i)	732	for (i = 0; i < len; ++i)
595	AvARRAY (av)[i] = decode_sv (dec);	733	AvARRAY (av)[i] = decode_sv (dec);
596	}	734	}
…		…
606		744
607	static void	745	static void
608	decode_he (dec_t dec, HV hv)	746	decode_he (dec_t dec, HV hv)
609	{	747	{
610	// for speed reasons, we specialcase single-string	748	// for speed reasons, we specialcase single-string
611	// byte or utf-8 strings as keys.	749	// byte or utf-8 strings as keys, but only when !stringref
612		750
613	if (dec->cur >= 0x40 && dec->cur <= 0x40 + 27)	751	if (ecb_expect_true (!dec->stringref))
		752	if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
614	{	753	{
615	I32 len = decode_uint (dec);	754	I32 len = decode_uint (dec);
616	char key = (char )dec->cur;	755	char key = (char )dec->cur;
617		756
		757	WANT (len);
618	dec->cur += len;	758	dec->cur += len;
619		759
620	hv_store (hv, key, len, decode_sv (dec), 0);	760	hv_store (hv, key, len, decode_sv (dec), 0);
		761
		762	return;
621	}	763	}
622	else if (dec->cur >= 0x60 && dec->cur <= 0x60 + 27)	764	else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8))
623	{	765	{
624	I32 len = decode_uint (dec);	766	I32 len = decode_uint (dec);
625	char key = (char )dec->cur;	767	char key = (char )dec->cur;
626		768
		769	WANT (len);
627	dec->cur += len;	770	dec->cur += len;
628		771
		772	if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
		773	if (!is_utf8_string (key, len))
		774	ERR ("corrupted CBOR data (invalid UTF-8 in map key)");
		775
629	hv_store (hv, key, -len, decode_sv (dec), 0);	776	hv_store (hv, key, -len, decode_sv (dec), 0);
		777
		778	return;
630	}	779	}
631	else	780
632	{
633	SV *k = decode_sv (dec);	781	SV *k = decode_sv (dec);
634	SV *v = decode_sv (dec);	782	SV *v = decode_sv (dec);
635		783
636	hv_store_ent (hv, k, v, 0);	784	hv_store_ent (hv, k, v, 0);
637	SvREFCNT_dec (k);	785	SvREFCNT_dec (k);
638	}	786
		787	fail:
		788	;
639	}	789	}
640		790
641	static SV *	791	static SV *
642	decode_hv (dec_t *dec)	792	decode_hv (dec_t *dec)
643	{	793	{
644	HV *hv = newHV ();	794	HV *hv = newHV ();
645		795
646	DEC_INC_DEPTH;	796	DEC_INC_DEPTH;
647		797
648	if ((*dec->cur & 31) == 31)	798	if (*dec->cur == (MAJOR_MAP \| MINOR_INDEF))
649	{	799	{
650	++dec->cur;	800	++dec->cur;
651		801
652	for (;;)	802	for (;;)
653	{	803	{
654	WANT (1);	804	WANT (1);
655		805
656	if (*dec->cur == (0xe0 \| 31))	806	if (*dec->cur == (MAJOR_MISC \| MINOR_INDEF))
657	{	807	{
658	++dec->cur;	808	++dec->cur;
659	break;	809	break;
660	}	810	}
661		811
…		…
682	static SV *	832	static SV *
683	decode_str (dec_t *dec, int utf8)	833	decode_str (dec_t *dec, int utf8)
684	{	834	{
685	SV *sv = 0;	835	SV *sv = 0;
686		836
687	if ((*dec->cur & 31) == 31)	837	if ((*dec->cur & MINOR_MASK) == MINOR_INDEF)
688	{	838	{
		839	// indefinite length strings
689	++dec->cur;	840	++dec->cur;
690		841
		842	U8 major = *dec->cur & MAJOR_MISC;
		843
691	sv = newSVpvn ("", 0);	844	sv = newSVpvn ("", 0);
692		845
693	// not very fast, and certainly not robust against illegal input
694	for (;;)	846	for (;;)
695	{	847	{
696	WANT (1);	848	WANT (1);
697		849
698	if (*dec->cur == (0xe0 \| 31))	850	if ((*dec->cur - major) > LENGTH_EXT8)
		851	if (*dec->cur == (MAJOR_MISC \| MINOR_INDEF))
699	{	852	{
700	++dec->cur;	853	++dec->cur;
701	break;	854	break;
702	}	855	}
		856	else
		857	ERR ("corrupted CBOR data (invalid chunks in indefinite length string)");
703		858
704	sv_catsv (sv, decode_sv (dec));	859	STRLEN len = decode_uint (dec);
		860
		861	WANT (len);
		862	sv_catpvn (sv, dec->cur, len);
		863	dec->cur += len;
705	}	864	}
706	}	865	}
707	else	866	else
708	{	867	{
709	STRLEN len = decode_uint (dec);	868	STRLEN len = decode_uint (dec);
710		869
711	WANT (len);	870	WANT (len);
712	sv = newSVpvn (dec->cur, len);	871	sv = newSVpvn (dec->cur, len);
713	dec->cur += len;	872	dec->cur += len;
		873
		874	if (ecb_expect_false (dec->stringref)
		875	&& SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1))
		876	av_push (dec->stringref, SvREFCNT_inc_NN (sv));
714	}	877	}
715		878
716	if (utf8)	879	if (utf8)
		880	{
		881	if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
		882	if (!is_utf8_string (SvPVX (sv), SvCUR (sv)))
		883	ERR ("corrupted CBOR data (invalid UTF-8 in text string)");
		884
717	SvUTF8_on (sv);	885	SvUTF8_on (sv);
		886	}
718		887
719	return sv;	888	return sv;
720		889
721	fail:	890	fail:
722	SvREFCNT_dec (sv);	891	SvREFCNT_dec (sv);
…		…
732	WANT (1);	901	WANT (1);
733		902
734	switch (tag)	903	switch (tag)
735	{	904	{
736	case CBOR_TAG_MAGIC:	905	case CBOR_TAG_MAGIC:
737	return decode_sv (dec);	906	sv = decode_sv (dec);
		907	break;
738		908
739	case CBOR_TAG_INDIRECTION:	909	case CBOR_TAG_INDIRECTION:
740	return newRV_noinc (decode_sv (dec));	910	sv = newRV_noinc (decode_sv (dec));
		911	break;
		912
		913	case CBOR_TAG_STRINGREF_NAMESPACE:
		914	{
		915	ENTER; SAVETMPS;
		916
		917	SAVESPTR (dec->stringref);
		918	dec->stringref = (AV )sv_2mortal ((SV )newAV ());
		919
		920	sv = decode_sv (dec);
		921
		922	FREETMPS; LEAVE;
		923	}
		924	break;
		925
		926	case CBOR_TAG_STRINGREF:
		927	{
		928	if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
		929	ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
		930
		931	UV idx = decode_uint (dec);
		932
		933	if (!dec->stringref \|\| (int)idx > AvFILLp (dec->stringref))
		934	ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)");
		935
		936	sv = newSVsv (AvARRAY (dec->stringref)[idx]);
		937	}
		938	break;
741		939
742	case CBOR_TAG_VALUE_SHAREABLE:	940	case CBOR_TAG_VALUE_SHAREABLE:
743	{	941	{
744	if (ecb_expect_false (!dec->shareable))	942	if (ecb_expect_false (!dec->shareable))
745	dec->shareable = (AV )sv_2mortal ((SV )newAV ());	943	dec->shareable = (AV )sv_2mortal ((SV )newAV ());
746		944
		945	if (dec->cbor.flags & F_ALLOW_CYCLES)
		946	{
747	sv = newSV (0);	947	sv = newSV (0);
748	av_push (dec->shareable, SvREFCNT_inc_NN (sv));	948	av_push (dec->shareable, SvREFCNT_inc_NN (sv));
749		949
750	SV *osv = decode_sv (dec);	950	SV *osv = decode_sv (dec);
751	sv_setsv (sv, osv);	951	sv_setsv (sv, osv);
752	SvREFCNT_dec_NN (osv);	952	SvREFCNT_dec_NN (osv);
753	}	953	}
754		954	else
755	return sv;	955	{
		956	av_push (dec->shareable, &PL_sv_undef);
		957	int idx = AvFILLp (dec->shareable);
		958	sv = decode_sv (dec);
		959	av_store (dec->shareable, idx, SvREFCNT_inc_NN (sv));
		960	}
		961	}
		962	break;
756		963
757	case CBOR_TAG_VALUE_SHAREDREF:	964	case CBOR_TAG_VALUE_SHAREDREF:
758	{	965	{
759	if ((*dec->cur >> 5) != 0)	966	if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
760	ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");	967	ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
761		968
762	UV idx = decode_uint (dec);	969	UV idx = decode_uint (dec);
763		970
764	if (!dec->shareable \|\| idx > AvFILLp (dec->shareable))	971	if (!dec->shareable \|\| (int)idx > AvFILLp (dec->shareable))
765	ERR ("corrupted CBOR data (sharedref index out of bounds)");	972	ERR ("corrupted CBOR data (sharedref index out of bounds)");
766		973
767	return SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);	974	sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
		975
		976	if (sv == &PL_sv_undef)
		977	ERR ("cyclic CBOR data structure found, but allow_cycles is not enabled");
768	}	978	}
		979	break;
769		980
770	case CBOR_TAG_PERL_OBJECT:	981	case CBOR_TAG_PERL_OBJECT:
771	{	982	{
772	sv = decode_sv (dec);	983	sv = decode_sv (dec);
773		984
…		…
786	if (!method)	997	if (!method)
787	ERR ("cannot decode perl-object (package does not have a THAW method)");	998	ERR ("cannot decode perl-object (package does not have a THAW method)");
788		999
789	dSP;	1000	dSP;
790		1001
791	ENTER; SAVETMPS; PUSHMARK (SP);	1002	ENTER; SAVETMPS;
		1003	PUSHMARK (SP);
792	EXTEND (SP, len + 1);	1004	EXTEND (SP, len + 1);
793	// we re-bless the reference to get overload and other niceties right	1005	// we re-bless the reference to get overload and other niceties right
794	PUSHs (*av_fetch (av, 0, 1));	1006	PUSHs (*av_fetch (av, 0, 1));
795	PUSHs (sv_cbor);	1007	PUSHs (sv_cbor);
796		1008
…		…
813	sv = SvREFCNT_inc (POPs);	1025	sv = SvREFCNT_inc (POPs);
814		1026
815	PUTBACK;	1027	PUTBACK;
816		1028
817	FREETMPS; LEAVE;	1029	FREETMPS; LEAVE;
818
819	return sv;
820	}	1030	}
		1031	break;
821		1032
822	default:	1033	default:
823	{	1034	{
824	sv = decode_sv (dec);	1035	sv = decode_sv (dec);
825		1036
		1037	dSP;
		1038	ENTER; SAVETMPS;
		1039	SAVESTACK_POS ();
		1040	PUSHMARK (SP);
		1041	EXTEND (SP, 2);
		1042	PUSHs (newSVuv (tag));
		1043	PUSHs (sv);
		1044
		1045	PUTBACK;
		1046	int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY \| G_EVAL);
		1047	SPAGAIN;
		1048
		1049	if (SvTRUE (ERRSV))
		1050	{
		1051	FREETMPS; LEAVE;
		1052	ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
		1053	}
		1054
		1055	if (count)
		1056	{
		1057	SvREFCNT_dec (sv);
		1058	sv = SvREFCNT_inc (POPs);
		1059	}
		1060	else
		1061	{
826	AV *av = newAV ();	1062	AV *av = newAV ();
827	av_push (av, newSVuv (tag));	1063	av_push (av, newSVuv (tag));
828	av_push (av, sv);	1064	av_push (av, sv);
829		1065
830	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash	1066	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
831	? cbor_tagged_stash	1067	? cbor_tagged_stash
832	: gv_stashpv ("CBOR::XS::Tagged" , 1);	1068	: gv_stashpv ("CBOR::XS::Tagged" , 1);
833
834	return sv_bless (newRV_noinc ((SV *)av), tagged_stash);	1069	sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash);
835	}	1070	}
		1071
		1072	PUTBACK;
		1073
		1074	FREETMPS; LEAVE;
		1075	}
		1076	break;
836	}	1077	}
		1078
		1079	return sv;
837		1080
838	fail:	1081	fail:
839	SvREFCNT_dec (sv);	1082	SvREFCNT_dec (sv);
840	return &PL_sv_undef;	1083	return &PL_sv_undef;
841	}	1084	}
…		…
843	static SV *	1086	static SV *
844	decode_sv (dec_t *dec)	1087	decode_sv (dec_t *dec)
845	{	1088	{
846	WANT (1);	1089	WANT (1);
847		1090
848	switch (*dec->cur >> 5)	1091	switch (*dec->cur >> MAJOR_SHIFT)
849	{	1092	{
850	case 0: // unsigned int	1093	case MAJOR_POS_INT >> MAJOR_SHIFT: return newSVuv (decode_uint (dec));
851	return newSVuv (decode_uint (dec));	1094	case MAJOR_NEG_INT >> MAJOR_SHIFT: return newSViv (-1 - (IV)decode_uint (dec));
852	case 1: // negative int	1095	case MAJOR_BYTES >> MAJOR_SHIFT: return decode_str (dec, 0);
853	return newSViv (-1 - (IV)decode_uint (dec));	1096	case MAJOR_TEXT >> MAJOR_SHIFT: return decode_str (dec, 1);
854	case 2: // octet string	1097	case MAJOR_ARRAY >> MAJOR_SHIFT: return decode_av (dec);
855	return decode_str (dec, 0);	1098	case MAJOR_MAP >> MAJOR_SHIFT: return decode_hv (dec);
856	case 3: // utf-8 string	1099	case MAJOR_TAG >> MAJOR_SHIFT: return decode_tagged (dec);
857	return decode_str (dec, 1);	1100
858	case 4: // array	1101	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)	1102	switch (*dec->cur++ & MINOR_MASK)
866	{	1103	{
867	case 20:	1104	case SIMPLE_FALSE:
868	#if CBOR_SLOW	1105	#if CBOR_SLOW
869	types_false = get_bool ("Types::Serialiser::false");	1106	types_false = get_bool ("Types::Serialiser::false");
870	#endif	1107	#endif
871	return newSVsv (types_false);	1108	return newSVsv (types_false);
872	case 21:	1109	case SIMPLE_TRUE:
873	#if CBOR_SLOW	1110	#if CBOR_SLOW
874	types_true = get_bool ("Types::Serialiser::true");	1111	types_true = get_bool ("Types::Serialiser::true");
875	#endif	1112	#endif
876	return newSVsv (types_true);	1113	return newSVsv (types_true);
877	case 22:	1114	case SIMPLE_NULL:
878	return newSVsv (&PL_sv_undef);	1115	return newSVsv (&PL_sv_undef);
879	case 23:	1116	case SIMPLE_UNDEF:
880	#if CBOR_SLOW	1117	#if CBOR_SLOW
881	types_error = get_bool ("Types::Serialiser::error");	1118	types_error = get_bool ("Types::Serialiser::error");
882	#endif	1119	#endif
883	return newSVsv (types_error);	1120	return newSVsv (types_error);
884		1121
885	case 25:	1122	case MISC_FLOAT16:
886	{	1123	{
887	WANT (2);	1124	WANT (2);
888		1125
889	uint16_t fp = (dec->cur[0] << 8) \| dec->cur[1];	1126	uint16_t fp = (dec->cur[0] << 8) \| dec->cur[1];
890	dec->cur += 2;	1127	dec->cur += 2;
891		1128
892	return newSVnv (ecb_binary16_to_float (fp));	1129	return newSVnv (ecb_binary16_to_float (fp));
893	}	1130	}
894		1131
895	case 26:	1132	case MISC_FLOAT32:
896	{	1133	{
897	uint32_t fp;	1134	uint32_t fp;
898	WANT (4);	1135	WANT (4);
899	memcpy (&fp, dec->cur, 4);	1136	memcpy (&fp, dec->cur, 4);
900	dec->cur += 4;	1137	dec->cur += 4;
…		…
903	fp = ecb_bswap32 (fp);	1140	fp = ecb_bswap32 (fp);
904		1141
905	return newSVnv (ecb_binary32_to_float (fp));	1142	return newSVnv (ecb_binary32_to_float (fp));
906	}	1143	}
907		1144
908	case 27:	1145	case MISC_FLOAT64:
909	{	1146	{
910	uint64_t fp;	1147	uint64_t fp;
911	WANT (8);	1148	WANT (8);
912	memcpy (&fp, dec->cur, 8);	1149	memcpy (&fp, dec->cur, 8);
913	dec->cur += 8;	1150	dec->cur += 8;
…		…
916	fp = ecb_bswap64 (fp);	1153	fp = ecb_bswap64 (fp);
917		1154
918	return newSVnv (ecb_binary64_to_double (fp));	1155	return newSVnv (ecb_binary64_to_double (fp));
919	}	1156	}
920		1157
921	// 0..19 unassigned	1158	// 0..19 unassigned simple
922	// 24 reserved + unassigned (reserved values are not encodable)	1159	// 24 reserved + unassigned simple (reserved values are not encodable)
		1160	// 28-30 unassigned misc
		1161	// 31 break code
923	default:	1162	default:
924	ERR ("corrupted CBOR data (reserved/unassigned major 7 value)");	1163	ERR ("corrupted CBOR data (reserved/unassigned/unexpected major 7 value)");
925	}	1164	}
926		1165
927	break;	1166	break;
928	}	1167	}
929		1168
…		…
932	}	1171	}
933		1172
934	static SV *	1173	static SV *
935	decode_cbor (SV string, CBOR cbor, char **offset_return)	1174	decode_cbor (SV string, CBOR cbor, char **offset_return)
936	{	1175	{
937	dec_t dec = { };	1176	dec_t dec = { 0 };
938	SV *sv;	1177	SV *sv;
939	STRLEN len;	1178	STRLEN len;
940	char *data = SvPVbyte (string, len);	1179	char *data = SvPVbyte (string, len);
941		1180
942	if (len > cbor->max_size && cbor->max_size)	1181	if (len > cbor->max_size && cbor->max_size)
…		…
956	if (dec.cur != dec.end && !dec.err)	1195	if (dec.cur != dec.end && !dec.err)
957	dec.err = "garbage after CBOR object";	1196	dec.err = "garbage after CBOR object";
958		1197
959	if (dec.err)	1198	if (dec.err)
960	{	1199	{
		1200	if (dec.shareable)
		1201	{
		1202	// need to break cyclic links, which whould all be in shareable
		1203	int i;
		1204	SV **svp;
		1205
		1206	for (i = av_len (dec.shareable) + 1; i--; )
		1207	if ((svp = av_fetch (dec.shareable, i, 0)))
		1208	sv_setsv (*svp, &PL_sv_undef);
		1209	}
		1210
961	SvREFCNT_dec (sv);	1211	SvREFCNT_dec (sv);
962	croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 )data, (int)(uint8_t)dec.cur);	1212	croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 )data, (int)(uint8_t)dec.cur);
963	}	1213	}
964		1214
965	sv = sv_2mortal (sv);	1215	sv = sv_2mortal (sv);
966		1216
967	return sv;	1217	return sv;
968	}	1218	}
969		1219
		1220	/////////////////////////////////////////////////////////////////////////////
		1221	// incremental parser
		1222
		1223	#define INCR_DONE(cbor) (AvFILLp (cbor->incr_count) < 0)
		1224
		1225	// returns 0 for notyet, 1 for success or error
		1226	static int
		1227	incr_parse (CBOR self, SV cborstr)
		1228	{
		1229	STRLEN cur;
		1230	SvPV (cborstr, cur);
		1231
		1232	while (ecb_expect_true (self->incr_need <= cur))
		1233	{
		1234	// table of integer count bytes
		1235	static I8 incr_len[MINOR_MASK + 1] = {
		1236	0, 0, 0, 0, 0, 0, 0, 0,
		1237	0, 0, 0, 0, 0, 0, 0, 0,
		1238	0, 0, 0, 0, 0, 0, 0, 0,
		1239	1, 2, 4, 8,-1,-1,-1,-2
		1240	};
		1241
		1242	const U8 *p = SvPVX (cborstr) + self->incr_pos;
		1243	U8 m = *p & MINOR_MASK;
		1244	IV count = SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]);
		1245	I8 ilen = incr_len[m];
		1246
		1247	self->incr_need = self->incr_pos + 1;
		1248
		1249	if (ecb_expect_false (ilen < 0))
		1250	{
		1251	if (m != MINOR_INDEF)
		1252	return 1; // error
		1253
		1254	if (*p == (MAJOR_MISC \| MINOR_INDEF))
		1255	{
		1256	if (count >= 0)
		1257	return 1; // error
		1258
		1259	count = 1;
		1260	}
		1261	else
		1262	{
		1263	av_push (self->incr_count, newSViv (-1)); //TODO: nest
		1264	count = -1;
		1265	}
		1266	}
		1267	else
		1268	{
		1269	self->incr_need += ilen;
		1270	if (ecb_expect_false (self->incr_need > cur))
		1271	return 0;
		1272
		1273	int major = *p >> MAJOR_SHIFT;
		1274
		1275	switch (major)
		1276	{
		1277	case MAJOR_TAG >> MAJOR_SHIFT:
		1278	++count; // tags merely prefix another value
		1279	break;
		1280
		1281	case MAJOR_BYTES >> MAJOR_SHIFT:
		1282	case MAJOR_TEXT >> MAJOR_SHIFT:
		1283	case MAJOR_ARRAY >> MAJOR_SHIFT:
		1284	case MAJOR_MAP >> MAJOR_SHIFT:
		1285	{
		1286	UV len;
		1287
		1288	if (ecb_expect_false (ilen))
		1289	{
		1290	len = 0;
		1291
		1292	do {
		1293	len = (len << 8) \| *++p;
		1294	} while (--ilen);
		1295	}
		1296	else
		1297	len = m;
		1298
		1299	switch (major)
		1300	{
		1301	case MAJOR_BYTES >> MAJOR_SHIFT:
		1302	case MAJOR_TEXT >> MAJOR_SHIFT:
		1303	self->incr_need += len;
		1304	if (ecb_expect_false (self->incr_need > cur))
		1305	return 0;
		1306
		1307	break;
		1308
		1309	case MAJOR_MAP >> MAJOR_SHIFT:
		1310	len <<= 1;
		1311	case MAJOR_ARRAY >> MAJOR_SHIFT:
		1312	if (len)
		1313	{
		1314	av_push (self->incr_count, newSViv (len + 1)); //TODO: nest
		1315	count = len + 1;
		1316	}
		1317	break;
		1318	}
		1319	}
		1320	}
		1321	}
		1322
		1323	self->incr_pos = self->incr_need;
		1324
		1325	if (count > 0)
		1326	{
		1327	while (!--count)
		1328	{
		1329	if (!AvFILLp (self->incr_count))
		1330	return 1; // done
		1331
		1332	SvREFCNT_dec_NN (av_pop (self->incr_count));
		1333	count = SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]);
		1334	}
		1335
		1336	SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]) = count;
		1337	}
		1338	}
		1339
		1340	return 0;
		1341	}
		1342
		1343
970	/////////////////////////////////////////////////////////////////////////////	1344	/////////////////////////////////////////////////////////////////////////////
971	// XS interface functions	1345	// XS interface functions
972		1346
973	MODULE = CBOR::XS PACKAGE = CBOR::XS	1347	MODULE = CBOR::XS PACKAGE = CBOR::XS
974		1348
…		…
981	types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);	1355	types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);
982		1356
983	types_true = get_bool ("Types::Serialiser::true" );	1357	types_true = get_bool ("Types::Serialiser::true" );
984	types_false = get_bool ("Types::Serialiser::false");	1358	types_false = get_bool ("Types::Serialiser::false");
985	types_error = get_bool ("Types::Serialiser::error");	1359	types_error = get_bool ("Types::Serialiser::error");
		1360
		1361	default_filter = newSVpv ("CBOR::XS::default_filter", 0);
986		1362
987	sv_cbor = newSVpv ("CBOR", 0);	1363	sv_cbor = newSVpv ("CBOR", 0);
988	SvREADONLY_on (sv_cbor);	1364	SvREADONLY_on (sv_cbor);
989	}	1365	}
990		1366
…		…
1012	void shrink (CBOR *self, int enable = 1)	1388	void shrink (CBOR *self, int enable = 1)
1013	ALIAS:	1389	ALIAS:
1014	shrink = F_SHRINK	1390	shrink = F_SHRINK
1015	allow_unknown = F_ALLOW_UNKNOWN	1391	allow_unknown = F_ALLOW_UNKNOWN
1016	allow_sharing = F_ALLOW_SHARING	1392	allow_sharing = F_ALLOW_SHARING
1017	dedup_keys = F_DEDUP_KEYS	1393	allow_cycles = F_ALLOW_CYCLES
1018	dedup_strings = F_DEDUP_STRINGS	1394	pack_strings = F_PACK_STRINGS
		1395	validate_utf8 = F_VALIDATE_UTF8
1019	PPCODE:	1396	PPCODE:
1020	{	1397	{
1021	if (enable)	1398	if (enable)
1022	self->flags \|= ix;	1399	self->flags \|= ix;
1023	else	1400	else
…		…
1029	void get_shrink (CBOR *self)	1406	void get_shrink (CBOR *self)
1030	ALIAS:	1407	ALIAS:
1031	get_shrink = F_SHRINK	1408	get_shrink = F_SHRINK
1032	get_allow_unknown = F_ALLOW_UNKNOWN	1409	get_allow_unknown = F_ALLOW_UNKNOWN
1033	get_allow_sharing = F_ALLOW_SHARING	1410	get_allow_sharing = F_ALLOW_SHARING
1034	get_dedup_keys = F_DEDUP_KEYS	1411	get_allow_cycles = F_ALLOW_CYCLES
1035	get_dedup_strings = F_DEDUP_STRINGS	1412	get_pack_strings = F_PACK_STRINGS
		1413	get_validate_utf8 = F_VALIDATE_UTF8
1036	PPCODE:	1414	PPCODE:
1037	XPUSHs (boolSV (self->flags & ix));	1415	XPUSHs (boolSV (self->flags & ix));
1038		1416
1039	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)	1417	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
1040	PPCODE:	1418	PPCODE:
…		…
1053	XPUSHs (ST (0));	1431	XPUSHs (ST (0));
1054		1432
1055	int get_max_size (CBOR *self)	1433	int get_max_size (CBOR *self)
1056	CODE:	1434	CODE:
1057	RETVAL = self->max_size;	1435	RETVAL = self->max_size;
		1436	OUTPUT:
		1437	RETVAL
		1438
		1439	void filter (CBOR self, SV filter = 0)
		1440	PPCODE:
		1441	SvREFCNT_dec (self->filter);
		1442	self->filter = filter ? newSVsv (filter) : filter;
		1443	XPUSHs (ST (0));
		1444
		1445	SV get_filter (CBOR self)
		1446	CODE:
		1447	RETVAL = self->filter ? self->filter : NEWSV (0, 0);
1058	OUTPUT:	1448	OUTPUT:
1059	RETVAL	1449	RETVAL
1060		1450
1061	void encode (CBOR self, SV scalar)	1451	void encode (CBOR self, SV scalar)
1062	PPCODE:	1452	PPCODE:
…		…
1077	EXTEND (SP, 2);	1467	EXTEND (SP, 2);
1078	PUSHs (sv);	1468	PUSHs (sv);
1079	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));	1469	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1080	}	1470	}
1081		1471
		1472	void incr_parse (CBOR self, SV cborstr)
		1473	ALIAS:
		1474	incr_parse_multiple = 1
		1475	PPCODE:
		1476	{
		1477	if (SvUTF8 (cborstr))
		1478	sv_utf8_downgrade (cborstr, 0);
		1479
		1480	if (!self->incr_count)
		1481	{
		1482	self->incr_count = newAV ();
		1483	self->incr_pos = 0;
		1484	self->incr_need = 1;
		1485
		1486	av_push (self->incr_count, newSViv (1));
		1487	}
		1488
		1489	do
		1490	{
		1491	if (!incr_parse (self, cborstr))
		1492	{
		1493	if (self->incr_need > self->max_size && self->max_size)
		1494	croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",
		1495	(unsigned long)self->incr_need, (unsigned long)self->max_size);
		1496
		1497	break;
		1498	}
		1499
		1500	SV *sv;
		1501	char *offset;
		1502
		1503	PUTBACK; sv = decode_cbor (cborstr, self, &offset); SPAGAIN;
		1504	XPUSHs (sv);
		1505
		1506	sv_chop (cborstr, offset);
		1507
		1508	av_clear (self->incr_count);
		1509	av_push (self->incr_count, newSViv (1));
		1510
		1511	self->incr_pos = 0;
		1512	self->incr_need = self->incr_pos + 1;
		1513	}
		1514	while (ix);
		1515	}
		1516
		1517	void incr_reset (CBOR *self)
		1518	CODE:
		1519	{
		1520	SvREFCNT_dec (self->incr_count);
		1521	self->incr_count = 0;
		1522	}
		1523
		1524	void DESTROY (CBOR *self)
		1525	PPCODE:
		1526	cbor_free (self);
		1527
1082	PROTOTYPES: ENABLE	1528	PROTOTYPES: ENABLE
1083		1529
1084	void encode_cbor (SV *scalar)	1530	void encode_cbor (SV *scalar)
		1531	ALIAS:
		1532	encode_cbor = 0
		1533	encode_cbor_sharing = F_ALLOW_SHARING
1085	PPCODE:	1534	PPCODE:
1086	{	1535	{
1087	CBOR cbor;	1536	CBOR cbor;
1088	cbor_init (&cbor);	1537	cbor_init (&cbor);
		1538	cbor.flags \|= ix;
1089	PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN;	1539	PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN;
1090	XPUSHs (scalar);	1540	XPUSHs (scalar);
1091	}	1541	}
1092		1542
1093	void decode_cbor (SV *cborstr)	1543	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.50 by root, Thu Feb 25 02:29:22 2016 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.50 by root, Thu Feb 25 02:29:22 2016 UTC