ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/CBOR-XS/XS.xs

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.32 by root, Thu Nov 28 12:08:07 2013 UTC vs.
Revision 1.67 by root, Sun Nov 29 21:35:06 2020 UTC

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

Diff Legend

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