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

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

Diff Legend

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

Comparing cvsroot/CBOR-XS/XS.xs (file contents): Revision 1.20 by root, Wed Nov 20 11:06:42 2013 UTC vs. Revision 1.51 by root, Sun Apr 24 13:15:19 2016 UTC

Diff Legend

Comparing cvsroot/CBOR-XS/XS.xs (file contents):
Revision 1.20 by root, Wed Nov 20 11:06:42 2013 UTC vs.
Revision 1.51 by root, Sun Apr 24 13:15:19 2016 UTC