ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/CBOR-XS/XS.xs

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.18 by root, Wed Nov 20 01:09:46 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
		29	#ifndef SvREFCNT_dec_NN
		30	# define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
		31	#endif
		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	};
24		69
25	// known tags	70	// known tags
26	enum cbor_tag	71	enum cbor_tag
27	{	72	{
28	// inofficial extensions (pending iana registration)	73	// extensions
		74	CBOR_TAG_STRINGREF = 25, // http://cbor.schmorp.de/stringref
29	CBOR_TAG_PERL_OBJECT = 24, // http://cbor.schmorp.de/perl-object	75	CBOR_TAG_PERL_OBJECT = 26, // http://cbor.schmorp.de/perl-object
30	CBOR_TAG_GENERIC_OBJECT = 25, // http://cbor.schmorp.de/generic-object	76	CBOR_TAG_GENERIC_OBJECT = 27, // http://cbor.schmorp.de/generic-object
31	CBOR_TAG_VALUE_SHARABLE = 26, // http://cbor.schmorp.de/value-sharing	77	CBOR_TAG_VALUE_SHAREABLE = 28, // http://cbor.schmorp.de/value-sharing
32	CBOR_TAG_VALUE_SHAREDREF = 27, // http://cbor.schmorp.de/value-sharing	78	CBOR_TAG_VALUE_SHAREDREF = 29, // http://cbor.schmorp.de/value-sharing
33	CBOR_TAG_STRINGREF_NAMESPACE = 65537, // http://cbor.schmorp.de/stringref	79	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	80	CBOR_TAG_INDIRECTION = 22098, // http://cbor.schmorp.de/indirection
36		81
37	// rfc7049	82	// rfc7049
38	CBOR_TAG_DATETIME = 0, // rfc4287, utf-8	83	CBOR_TAG_DATETIME = 0, // rfc4287, utf-8
39	CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any	84	CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any
40	CBOR_TAG_POS_BIGNUM = 2, // byte string	85	CBOR_TAG_POS_BIGNUM = 2, // byte string
41	CBOR_TAG_NEG_BIGNUM = 3, // byte string	86	CBOR_TAG_NEG_BIGNUM = 3, // byte string
42	CBOR_TAG_DECIMAL = 4, // decimal fraction, array	87	CBOR_TAG_DECIMAL = 4, // decimal fraction, array
43	CBOR_TAG_BIGFLOAT = 5, // array	88	CBOR_TAG_BIGFLOAT = 5, // array
44		89
45	CBOR_TAG_CONV_B64U = 21, // base64url, any	90	CBOR_TAG_CONV_B64U = 21, // base64url, any
46	CBOR_TAG_CONV_B64 = 22, // base64, any	91	CBOR_TAG_CONV_B64 = 22, // base64, any
47	CBOR_TAG_CONV_HEX = 23, // base16, any	92	CBOR_TAG_CONV_HEX = 23, // base16, any
48	CBOR_TAG_CBOR = 24, // embedded cbor, byte string	93	CBOR_TAG_CBOR = 24, // embedded cbor, byte string
49		94
50	CBOR_TAG_URI = 32, // URI rfc3986, utf-8	95	CBOR_TAG_URI = 32, // URI rfc3986, utf-8
51	CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8	96	CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8
52	CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8	97	CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8
53	CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8	98	CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8
54	CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8	99	CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
55		100
56	CBOR_TAG_MAGIC = 55799 // self-describe cbor	101	CBOR_TAG_MAGIC = 55799, // self-describe cbor
57	};	102	};
58		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
		115	};
		116
59	#define F_SHRINK 0x00000001UL	117	#define F_SHRINK 0x00000001UL
60	#define F_ALLOW_UNKNOWN 0x00000002UL	118	#define F_ALLOW_UNKNOWN 0x00000002UL
61	#define F_ALLOW_SHARING 0x00000004UL //TODO	119	#define F_ALLOW_SHARING 0x00000004UL
		120	#define F_ALLOW_CYCLES 0x00000008UL
		121	#define F_FORBID_OBJECTS 0x00000010UL
62	#define F_DEDUP_STRINGS 0x00000008UL //TODO	122	#define F_PACK_STRINGS 0x00000020UL
63	#define F_DEDUP_KEYS 0x00000010UL //TODO	123	#define F_TEXT_KEYS 0x00000040UL
		124	#define F_TEXT_STRINGS 0x00000080UL
		125	#define F_VALIDATE_UTF8 0x00000100UL
64		126
65	#define INIT_SIZE 32 // initial scalar size to be allocated	127	#define INIT_SIZE 32 // initial scalar size to be allocated
66		128
67	#define SB do {	129	#define SB do {
68	#define SE } while (0)	130	#define SE } while (0)
…		…
80	# define CBOR_SLOW 0	142	# define CBOR_SLOW 0
81	# define CBOR_STASH cbor_stash	143	# define CBOR_STASH cbor_stash
82	#endif	144	#endif
83		145
84	static HV *cbor_stash, *types_boolean_stash, *types_error_stash, *cbor_tagged_stash; // CBOR::XS::	146	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;	147	static SV *types_true, *types_false, *types_error, *sv_cbor, *default_filter;
86		148
87	typedef struct {	149	typedef struct {
88	U32 flags;	150	U32 flags;
89	U32 max_depth;	151	U32 max_depth;
90	STRLEN max_size;	152	STRLEN max_size;
		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.
91	} CBOR;	159	} CBOR;
92		160
93	ecb_inline void	161	ecb_inline void
94	cbor_init (CBOR *cbor)	162	cbor_init (CBOR *cbor)
95	{	163	{
96	Zero (cbor, 1, CBOR);	164	Zero (cbor, 1, CBOR);
97	cbor->max_depth = 512;	165	cbor->max_depth = 512;
		166	}
		167
		168	ecb_inline void
		169	cbor_free (CBOR *cbor)
		170	{
		171	SvREFCNT_dec (cbor->filter);
		172	SvREFCNT_dec (cbor->incr_count);
98	}	173	}
99		174
100	/////////////////////////////////////////////////////////////////////////////	175	/////////////////////////////////////////////////////////////////////////////
101	// utility functions	176	// utility functions
102		177
…		…
124	SvPV_renew (sv, SvCUR (sv) + 1);	199	SvPV_renew (sv, SvCUR (sv) + 1);
125	#endif	200	#endif
126	}	201	}
127	}	202	}
128		203
		204	// minimum length of a string to be registered for stringref
		205	ecb_inline int
		206	minimum_string_length (UV idx)
		207	{
		208	return idx <= 23 ? 3
		209	: idx <= 0xffU ? 4
		210	: idx <= 0xffffU ? 5
		211	: idx <= 0xffffffffU ? 7
		212	: 11;
		213	}
		214
129	/////////////////////////////////////////////////////////////////////////////	215	/////////////////////////////////////////////////////////////////////////////
130	// encoder	216	// encoder
131		217
132	// structure used for encoding CBOR	218	// structure used for encoding CBOR
133	typedef struct	219	typedef struct
…		…
135	char *cur; // SvPVX (sv) + current output position	221	char *cur; // SvPVX (sv) + current output position
136	char *end; // SvEND (sv)	222	char *end; // SvEND (sv)
137	SV *sv; // result scalar	223	SV *sv; // result scalar
138	CBOR cbor;	224	CBOR cbor;
139	U32 depth; // recursion level	225	U32 depth; // recursion level
140	HV *stringref; // string => index, or 0	226	HV *stringref[2]; // string => index, or 0 ([0] = bytes, [1] = utf-8)
		227	UV stringref_idx;
141	HV *sharable; // ptr => index, or 0	228	HV *shareable; // ptr => index, or 0
142	HV *sharable_idx;	229	UV shareable_idx;
143	} enc_t;	230	} enc_t;
144		231
145	ecb_inline void	232	ecb_inline void
146	need (enc_t *enc, STRLEN len)	233	need (enc_t *enc, STRLEN len)
147	{	234	{
148	if (ecb_expect_false (enc->cur + len >= enc->end))	235	if (ecb_expect_false ((uintptr_t)(enc->end - enc->cur) < len))
149	{	236	{
150	STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);	237	STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
151	SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);	238	SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
152	enc->cur = SvPVX (enc->sv) + cur;	239	enc->cur = SvPVX (enc->sv) + cur;
153	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;	240	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
…		…
159	{	246	{
160	need (enc, 1);	247	need (enc, 1);
161	*enc->cur++ = ch;	248	*enc->cur++ = ch;
162	}	249	}
163		250
		251	// used for tags, intregers, element counts and so on
164	static void	252	static void
165	encode_uint (enc_t *enc, int major, UV len)	253	encode_uint (enc_t *enc, int major, UV len)
166	{	254	{
167	need (enc, 9);	255	need (enc, 9);
168		256
169	if (len < 24)	257	if (ecb_expect_true (len < LENGTH_EXT1))
170	*enc->cur++ = major | len;	258	*enc->cur++ = major | len;
171	else if (len <= 0xff)	259	else if (ecb_expect_true (len <= 0xffU))
172	{	260	{
173	*enc->cur++ = major | 24;	261	*enc->cur++ = major | LENGTH_EXT1;
174	*enc->cur++ = len;	262	*enc->cur++ = len;
175	}	263	}
176	else if (len <= 0xffff)	264	else if (len <= 0xffffU)
177	{	265	{
178	*enc->cur++ = major | 25;	266	*enc->cur++ = major | LENGTH_EXT2;
179	*enc->cur++ = len >> 8;	267	*enc->cur++ = len >> 8;
180	*enc->cur++ = len;	268	*enc->cur++ = len;
181	}	269	}
182	else if (len <= 0xffffffff)	270	else if (len <= 0xffffffffU)
183	{	271	{
184	*enc->cur++ = major | 26;	272	*enc->cur++ = major | LENGTH_EXT4;
185	*enc->cur++ = len >> 24;	273	*enc->cur++ = len >> 24;
186	*enc->cur++ = len >> 16;	274	*enc->cur++ = len >> 16;
187	*enc->cur++ = len >> 8;	275	*enc->cur++ = len >> 8;
188	*enc->cur++ = len;	276	*enc->cur++ = len;
189	}	277	}
190	else	278	else
191	{	279	{
192	*enc->cur++ = major | 27;	280	*enc->cur++ = major | LENGTH_EXT8;
193	*enc->cur++ = len >> 56;	281	*enc->cur++ = len >> 56;
194	*enc->cur++ = len >> 48;	282	*enc->cur++ = len >> 48;
195	*enc->cur++ = len >> 40;	283	*enc->cur++ = len >> 40;
196	*enc->cur++ = len >> 32;	284	*enc->cur++ = len >> 32;
197	*enc->cur++ = len >> 24;	285	*enc->cur++ = len >> 24;
…		…
199	*enc->cur++ = len >> 8;	287	*enc->cur++ = len >> 8;
200	*enc->cur++ = len;	288	*enc->cur++ = len;
201	}	289	}
202	}	290	}
203		291
204	static void	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
		304	ecb_inline void
		305	encode_tag (enc_t *enc, UV tag)
		306	{
		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
205	encode_str (enc_t *enc, int utf8, char *str, STRLEN len)	312	encode_str_utf8 (enc_t *enc, int utf8, char *str, STRLEN len)
206	{	313	{
207	encode_uint (enc, utf8 ? 0x60 : 0x40, len);	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	}
		331	}
		332
		333	ecb_inline void
		334	encode_str (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len)
		335	{
		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);
208	need (enc, len);	344	need (enc, len);
209	memcpy (enc->cur, str, len);	345	memcpy (enc->cur, str, len);
210	enc->cur += len;	346	enc->cur += len;
211	}	347	}
212		348
213	ecb_inline void	349	ecb_inline void
214	encode_tag (enc_t *enc, UV tag)	350	encode_strref (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len)
215	{	351	{
216	encode_uint (enc, 0xc0, tag);	352	if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS))
217	}	353	{
		354	SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);
218		355
219	static int
220	encode_sharable2 (enc_t *enc, SV *sv)
221	{
222	if (!enc->sharable)
223	enc->sharable = (HV *)sv_2mortal ((SV *)newHV ());
224
225	SV **svp = hv_fetch (enc->sharable, &sv, sizeof (sv), 1);
226
227	if (SvOK (*svp))	356	if (SvOK (*svp))
228	{	357	{
		358	// already registered, use stringref
229	encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);	359	encode_tag (enc, CBOR_TAG_STRINGREF);
230	encode_uint (enc, 0x00, SvUV (*svp));	360	encode_uint (enc, MAJOR_POS_INT, SvUV (*svp));
231
232	return 1;	361	return;
233	}	362	}
234	else	363	else if (len >= minimum_string_length (enc->stringref_idx))
235	{	364	{
		365	// register only
236	sv_setuv (*svp, enc->sharable_idx++);	366	sv_setuv (*svp, enc->stringref_idx);
237	encode_tag (enc, CBOR_TAG_VALUE_SHARABLE);	367	++enc->stringref_idx;
238		368	}
239	return 0;
240	}	369	}
241	}
242		370
		371	encode_str (enc, upgrade_utf8, utf8, str, len);
		372	}
		373
243	ecb_inline int	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
244	encode_sharable (enc_t *enc, SV *sv)	423	encode_forced (enc_t *enc, UV type, SV *sv)
245	{	424	{
246	if (ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)	425	switch (type)
247	&& ecb_expect_false (SvREFCNT (sv) > 1))	426	{
248	return encode_sharable2 (enc, sv);	427	case AS_CBOR:
		428	{
		429	STRLEN len;
		430	char *str = SvPVbyte (sv, len);
249		431
250	return 0;	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	}
251	}	462	}
252		463
253	static void encode_sv (enc_t *enc, SV *sv);	464	static void encode_sv (enc_t *enc, SV *sv);
254		465
255	static void	466	static void
…		…
260	if (enc->depth >= enc->cbor.max_depth)	471	if (enc->depth >= enc->cbor.max_depth)
261	croak (ERR_NESTING_EXCEEDED);	472	croak (ERR_NESTING_EXCEEDED);
262		473
263	++enc->depth;	474	++enc->depth;
264		475
265	encode_uint (enc, 0x80, len + 1);	476	encode_uint (enc, MAJOR_ARRAY, len + 1);
266		477
		478	if (ecb_expect_false (SvMAGICAL (av)))
267	for (i = 0; i <= len; ++i)	479	for (i = 0; i <= len; ++i)
268	{	480	{
269	SV **svp = av_fetch (av, i, 0);	481	SV **svp = av_fetch (av, i, 0);
270	encode_sv (enc, svp ? *svp : &PL_sv_undef);	482	encode_sv (enc, svp ? *svp : &PL_sv_undef);
271	}	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	}
272		490
273	--enc->depth;	491	--enc->depth;
274	}	492	}
275		493
276	static void	494	static void
…		…
284	++enc->depth;	502	++enc->depth;
285		503
286	int pairs = hv_iterinit (hv);	504	int pairs = hv_iterinit (hv);
287	int mg = SvMAGICAL (hv);	505	int mg = SvMAGICAL (hv);
288		506
289	if (mg)	507	if (ecb_expect_false (mg))
290	encode_ch (enc, 0xa0 | 31);	508	encode_ch (enc, MAJOR_MAP | MINOR_INDEF);
291	else	509	else
292	encode_uint (enc, 0xa0, pairs);	510	encode_uint (enc, MAJOR_MAP, pairs);
293		511
294	while ((he = hv_iternext (hv)))	512	while ((he = hv_iternext (hv)))
295	{	513	{
296	if (HeKLEN (he) == HEf_SVKEY)	514	if (HeKLEN (he) == HEf_SVKEY)
297	encode_sv (enc, HeSVKEY (he));	515	encode_sv (enc, HeSVKEY (he));
298	else	516	else
299	encode_str (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));
300		518
301	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));
302	}	520	}
303		521
304	if (mg)	522	if (ecb_expect_false (mg))
305	encode_ch (enc, 0xe0 | 31);	523	encode_ch (enc, MAJOR_MISC | MINOR_INDEF);
306		524
307	--enc->depth;	525	--enc->depth;
308	}	526	}
309		527
310	// encode objects, arrays and special \0=false and \1=true values.	528	// encode objects, arrays and special \0=false and \1=true values.
311	static void	529	static void
312	encode_rv (enc_t *enc, SV *sv)	530	encode_rv (enc_t *enc, SV *sv)
313	{	531	{
314	svtype svt;
315
316	SvGETMAGIC (sv);	532	SvGETMAGIC (sv);
		533
317	svt = SvTYPE (sv);	534	svtype svt = SvTYPE (sv);
318
319	if (encode_sharable (enc, sv))
320	return;
321		535
322	if (ecb_expect_false (SvOBJECT (sv)))	536	if (ecb_expect_false (SvOBJECT (sv)))
323	{	537	{
324	HV *boolean_stash = !CBOR_SLOW || types_boolean_stash	538	HV *boolean_stash = !CBOR_SLOW || types_boolean_stash
325	? types_boolean_stash	539	? types_boolean_stash
…		…
330	HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash	544	HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
331	? cbor_tagged_stash	545	? cbor_tagged_stash
332	: gv_stashpv ("CBOR::XS::Tagged" , 1);	546	: gv_stashpv ("CBOR::XS::Tagged" , 1);
333		547
334	HV *stash = SvSTASH (sv);	548	HV *stash = SvSTASH (sv);
335	GV *method;
336		549
337	if (stash == boolean_stash)	550	if (stash == boolean_stash)
338	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	}
339	else if (stash == error_stash)	555	else if (stash == error_stash)
340	encode_ch (enc, 0xe0 | 23);	556	{
		557	encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF);
		558	return;
		559	}
341	else if (stash == tagged_stash)	560	else if (stash == tagged_stash)
342	{	561	{
343	if (svt != SVt_PVAV)	562	if (svt != SVt_PVAV)
344	croak ("encountered CBOR::XS::Tagged object that isn't an array");	563	croak ("encountered CBOR::XS::Tagged object that isn't an array");
345		564
		565	switch (av_len ((AV *)sv))
		566	{
		567	case 2-1:
		568	// actually a tagged value
346	encode_uint (enc, 0xc0, SvUV (*av_fetch ((AV *)sv, 0, 1)));	569	encode_uint (enc, MAJOR_TAG, SvUV (*av_fetch ((AV *)sv, 0, 1)));
347	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))
348	}	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))));
349	else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))	616	else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
350	{	617	{
351	dSP;	618	dSP;
352		619
353	ENTER; SAVETMPS; PUSHMARK (SP);	620	ENTER; SAVETMPS;
		621	PUSHMARK (SP);
354	// 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
355	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));	623	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
356		624
357	PUTBACK;	625	PUTBACK;
358	// G_SCALAR ensures that return value is 1	626	// G_SCALAR ensures that return value is 1
…		…
371	}	639	}
372	else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)	640	else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
373	{	641	{
374	dSP;	642	dSP;
375		643
376	ENTER; SAVETMPS; PUSHMARK (SP);	644	ENTER; SAVETMPS;
		645	PUSHMARK (SP);
377	EXTEND (SP, 2);	646	EXTEND (SP, 2);
378	// 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
379	PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));	648	PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
380	PUSHs (sv_cbor);	649	PUSHs (sv_cbor);
381		650
…		…
386	// catch this surprisingly common error	655	// catch this surprisingly common error
387	if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)	656	if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
388	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));
389		658
390	encode_tag (enc, CBOR_TAG_PERL_OBJECT);	659	encode_tag (enc, CBOR_TAG_PERL_OBJECT);
391	encode_uint (enc, 0x80, count + 1);	660	encode_uint (enc, MAJOR_ARRAY, count + 1);
392	encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));	661	encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
393		662
394	while (count)	663	{
		664	int i;
		665
		666	for (i = 0; i < count; ++i)
395	encode_sv (enc, SP[1 - count--]);	667	encode_sv (enc, SP[i + 1 - count]);
		668
		669	SP -= count;
		670	}
396		671
397	PUTBACK;	672	PUTBACK;
398		673
399	FREETMPS; LEAVE;	674	FREETMPS; LEAVE;
400	}	675	}
…		…
418	{	693	{
419	double nv = SvNVX (sv);	694	double nv = SvNVX (sv);
420		695
421	need (enc, 9);	696	need (enc, 9);
422		697
423	if (ecb_expect_false (nv == (U32)nv))	698	if (ecb_expect_false (nv == (NV)(U32)nv))
424	encode_uint (enc, 0x00, (U32)nv);	699	encode_uint (enc, MAJOR_POS_INT, (U32)nv);
425	//TODO: maybe I32?	700	//TODO: maybe I32?
426	else if (ecb_expect_false (nv == (float)nv))	701	else if (ecb_expect_false (nv == (float)nv))
427	{	702	encode_float32 (enc, nv);
428	uint32_t fp = ecb_float_to_binary32 (nv);
429
430	*enc->cur++ = 0xe0 | 26;
431
432	if (!ecb_big_endian ())
433	fp = ecb_bswap32 (fp);
434
435	memcpy (enc->cur, &fp, 4);
436	enc->cur += 4;
437	}
438	else	703	else
439	{	704	encode_float64 (enc, nv);
440	uint64_t fp = ecb_double_to_binary64 (nv);
441
442	*enc->cur++ = 0xe0 | 27;
443
444	if (!ecb_big_endian ())
445	fp = ecb_bswap64 (fp);
446
447	memcpy (enc->cur, &fp, 8);
448	enc->cur += 8;
449	}
450	}	705	}
451		706
452	static void	707	static void
453	encode_sv (enc_t *enc, SV *sv)	708	encode_sv (enc_t *enc, SV *sv)
454	{	709	{
455	SvGETMAGIC (sv);	710	SvGETMAGIC (sv);
456		711
457	if (encode_sharable (enc, sv))
458	return;
459
460	if (SvPOKp (sv))	712	if (SvPOKp (sv))
461	{	713	{
462	STRLEN len;	714	STRLEN len;
463	char *str = SvPV (sv, len);	715	char *str = SvPV (sv, len);
464	encode_str (enc, SvUTF8 (sv), str, len);	716	encode_strref (enc, enc->cbor.flags & F_TEXT_STRINGS, SvUTF8 (sv), str, len);
465	}	717	}
466	else if (SvNOKp (sv))	718	else if (SvNOKp (sv))
467	encode_nv (enc, sv);	719	encode_nv (enc, sv);
468	else if (SvIOKp (sv))	720	else if (SvIOKp (sv))
469	{	721	encode_int (enc, sv);
470	if (SvIsUV (sv))
471	encode_uint (enc, 0x00, SvUVX (sv));
472	else if (SvIVX (sv) >= 0)
473	encode_uint (enc, 0x00, SvIVX (sv));
474	else
475	encode_uint (enc, 0x20, -(SvIVX (sv) + 1));
476	}
477	else if (SvROK (sv))	722	else if (SvROK (sv))
478	encode_rv (enc, SvRV (sv));	723	encode_rv (enc, SvRV (sv));
479	else if (!SvOK (sv))	724	else if (!SvOK (sv))
480	encode_ch (enc, 0xe0 | 22);	725	encode_ch (enc, MAJOR_MISC | SIMPLE_NULL);
481	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)	726	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
482	encode_ch (enc, 0xe0 | 23);	727	encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF);
483	else	728	else
484	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",
485	SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));	730	SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
486	}	731	}
487		732
488	static SV *	733	static SV *
489	encode_cbor (SV *scalar, CBOR *cbor)	734	encode_cbor (SV *scalar, CBOR *cbor)
490	{	735	{
491	enc_t enc = { };	736	enc_t enc = { 0 };
492		737
493	enc.cbor = *cbor;	738	enc.cbor = *cbor;
494	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	739	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
495	enc.cur = SvPVX (enc.sv);	740	enc.cur = SvPVX (enc.sv);
496	enc.end = SvEND (enc.sv);	741	enc.end = SvEND (enc.sv);
497		742
498	SvPOK_only (enc.sv);	743	SvPOK_only (enc.sv);
		744
		745	if (cbor->flags & F_PACK_STRINGS)
		746	{
		747	encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE);
		748	enc.stringref[0]= (HV *)sv_2mortal ((SV *)newHV ());
		749	enc.stringref[1]= (HV *)sv_2mortal ((SV *)newHV ());
		750	}
		751
499	encode_sv (&enc, scalar);	752	encode_sv (&enc, scalar);
500		753
501	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	754	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
502	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	755	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
503		756
…		…
517	U8 *end; // end of input string	770	U8 *end; // end of input string
518	const char *err; // parse error, if != 0	771	const char *err; // parse error, if != 0
519	CBOR cbor;	772	CBOR cbor;
520	U32 depth; // recursion depth	773	U32 depth; // recursion depth
521	U32 maxdepth; // recursion depth limit	774	U32 maxdepth; // recursion depth limit
522	AV *sharable;	775	AV *shareable;
		776	AV *stringref;
		777	SV *decode_tagged;
		778	SV *err_sv; // optional sv for error, needs to be freed
523	} dec_t;	779	} dec_t;
524		780
525	#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);
526		788
527	#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;
528		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
529	#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)
530	#define DEC_DEC_DEPTH --dec->depth	818	#define DEC_DEC_DEPTH --dec->depth
531		819
532	static UV	820	static UV
533	decode_uint (dec_t *dec)	821	decode_uint (dec_t *dec)
534	{	822	{
535	switch (*dec->cur & 31)	823	U8 m = *dec->cur & MINOR_MASK;
536	{	824	++dec->cur;
537	case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:
538	case 8: case 9: case 10: case 11: case 12: case 13: case 14: case 15:
539	case 16: case 17: case 18: case 19: case 20: case 21: case 22: case 23:
540	return *dec->cur++ & 31;
541		825
542	case 24:	826	if (ecb_expect_true (m < LENGTH_EXT1))
		827	return m;
		828	else if (ecb_expect_true (m == LENGTH_EXT1))
		829	{
543	WANT (2);	830	WANT (1);
544	dec->cur += 2;	831	dec->cur += 1;
545	return dec->cur[-1];	832	return dec->cur[-1];
546		833	}
547	case 25:	834	else if (ecb_expect_true (m == LENGTH_EXT2))
		835	{
548	WANT (3);	836	WANT (2);
549	dec->cur += 3;	837	dec->cur += 2;
550	return (((UV)dec->cur[-2]) << 8)	838	return (((UV)dec->cur[-2]) << 8)
551	| ((UV)dec->cur[-1]);	839	| ((UV)dec->cur[-1]);
552		840	}
553	case 26:	841	else if (ecb_expect_true (m == LENGTH_EXT4))
		842	{
554	WANT (5);	843	WANT (4);
555	dec->cur += 5;	844	dec->cur += 4;
556	return (((UV)dec->cur[-4]) << 24)	845	return (((UV)dec->cur[-4]) << 24)
557	| (((UV)dec->cur[-3]) << 16)	846	| (((UV)dec->cur[-3]) << 16)
558	| (((UV)dec->cur[-2]) << 8)	847	| (((UV)dec->cur[-2]) << 8)
559	| ((UV)dec->cur[-1]);	848	| ((UV)dec->cur[-1]);
560		849	}
561	case 27:	850	else if (ecb_expect_true (m == LENGTH_EXT8))
		851	{
562	WANT (9);	852	WANT (8);
563	dec->cur += 9;	853	dec->cur += 8;
		854
		855	return
		856	#if UVSIZE < 8
		857	0
		858	#else
564	return (((UV)dec->cur[-8]) << 56)	859	(((UV)dec->cur[-8]) << 56)
565	| (((UV)dec->cur[-7]) << 48)	860	| (((UV)dec->cur[-7]) << 48)
566	| (((UV)dec->cur[-6]) << 40)	861	| (((UV)dec->cur[-6]) << 40)
567	| (((UV)dec->cur[-5]) << 32)	862	| (((UV)dec->cur[-5]) << 32)
		863	#endif
568	| (((UV)dec->cur[-4]) << 24)	864	| (((UV)dec->cur[-4]) << 24)
569	| (((UV)dec->cur[-3]) << 16)	865	| (((UV)dec->cur[-3]) << 16)
570	| (((UV)dec->cur[-2]) << 8)	866	| (((UV)dec->cur[-2]) << 8)
571	| ((UV)dec->cur[-1]);	867	| ((UV)dec->cur[-1]);
572		868	}
573	default:	869	else
574	ERR ("corrupted CBOR data (unsupported integer minor encoding)");	870	ERR ("corrupted CBOR data (unsupported integer minor encoding)");
575	}
576		871
577	fail:	872	fail:
578	return 0;	873	return 0;
579	}	874	}
580		875
…		…
585	{	880	{
586	AV *av = newAV ();	881	AV *av = newAV ();
587		882
588	DEC_INC_DEPTH;	883	DEC_INC_DEPTH;
589		884
590	if ((*dec->cur & 31) == 31)	885	if (*dec->cur == (MAJOR_ARRAY | MINOR_INDEF))
591	{	886	{
592	++dec->cur;	887	++dec->cur;
593		888
594	for (;;)	889	for (;;)
595	{	890	{
596	WANT (1);	891	WANT (1);
597		892
598	if (*dec->cur == (0xe0 | 31))	893	if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
599	{	894	{
600	++dec->cur;	895	++dec->cur;
601	break;	896	break;
602	}	897	}
603		898
604	av_push (av, decode_sv (dec));	899	av_push (av, decode_sv (dec));
605	}	900	}
606	}	901	}
607	else	902	else
608	{	903	{
609	int i, len = decode_uint (dec);	904	UV i, len = decode_uint (dec);
610		905
		906	WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays
611	av_fill (av, len - 1);	907	av_fill (av, len - 1);
612		908
613	for (i = 0; i < len; ++i)	909	for (i = 0; i < len; ++i)
614	AvARRAY (av)[i] = decode_sv (dec);	910	AvARRAY (av)[i] = decode_sv (dec);
615	}	911	}
616		912
617	DEC_DEC_DEPTH;	913	DEC_DEC_DEPTH;
618	return newRV_noinc ((SV *)av);	914	return newRV_noinc ((SV *)av);
619		915
620	fail:	916	fail:
621	SvREFCNT_dec (av);	917	SvREFCNT_dec_NN (av);
622	DEC_DEC_DEPTH;	918	DEC_DEC_DEPTH;
623	return &PL_sv_undef;	919	return &PL_sv_undef;
624	}	920	}
625		921
626	static void	922	static void
627	decode_he (dec_t *dec, HV *hv)	923	decode_he (dec_t *dec, HV *hv)
628	{	924	{
629	// for speed reasons, we specialcase single-string	925	// for speed reasons, we specialcase single-string
630	// byte or utf-8 strings as keys.	926	// byte or utf-8 strings as keys, but only when !stringref
631		927
632	if (*dec->cur >= 0x40 && *dec->cur <= 0x40 + 27)	928	if (ecb_expect_true (!dec->stringref))
		929	if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
633	{	930	{
634	I32 len = decode_uint (dec);	931	STRLEN len = decode_uint (dec);
635	char *key = (char *)dec->cur;	932	char *key = (char *)dec->cur;
636		933
		934	WANT (len);
637	dec->cur += len;	935	dec->cur += len;
638		936
639	hv_store (hv, key, len, decode_sv (dec), 0);	937	hv_store (hv, key, len, decode_sv (dec), 0);
		938
		939	return;
640	}	940	}
641	else if (*dec->cur >= 0x60 && *dec->cur <= 0x60 + 27)	941	else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8))
642	{	942	{
643	I32 len = decode_uint (dec);	943	STRLEN len = decode_uint (dec);
644	char *key = (char *)dec->cur;	944	char *key = (char *)dec->cur;
645		945
		946	WANT (len);
646	dec->cur += len;	947	dec->cur += len;
647		948
		949	if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
		950	if (!is_utf8_string (key, len))
		951	ERR ("corrupted CBOR data (invalid UTF-8 in map key)");
		952
648	hv_store (hv, key, -len, decode_sv (dec), 0);	953	hv_store (hv, key, -len, decode_sv (dec), 0);
		954
		955	return;
649	}	956	}
650	else	957
651	{
652	SV *k = decode_sv (dec);	958	SV *k = decode_sv (dec);
653	SV *v = decode_sv (dec);	959	SV *v = decode_sv (dec);
654		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
655	hv_store_ent (hv, k, v, 0);	989	hv_store_ent (hv, k, v, 0);
656	SvREFCNT_dec (k);	990	SvREFCNT_dec_NN (k);
657	}	991
		992	fail:
		993	;
658	}	994	}
659		995
660	static SV *	996	static SV *
661	decode_hv (dec_t *dec)	997	decode_hv (dec_t *dec)
662	{	998	{
663	HV *hv = newHV ();	999	HV *hv = newHV ();
664		1000
665	DEC_INC_DEPTH;	1001	DEC_INC_DEPTH;
666		1002
667	if ((*dec->cur & 31) == 31)	1003	if (*dec->cur == (MAJOR_MAP | MINOR_INDEF))
668	{	1004	{
669	++dec->cur;	1005	++dec->cur;
670		1006
671	for (;;)	1007	for (;;)
672	{	1008	{
673	WANT (1);	1009	WANT (1);
674		1010
675	if (*dec->cur == (0xe0 | 31))	1011	if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
676	{	1012	{
677	++dec->cur;	1013	++dec->cur;
678	break;	1014	break;
679	}	1015	}
680		1016
681	decode_he (dec, hv);	1017	decode_he (dec, hv);
682	}	1018	}
683	}	1019	}
684	else	1020	else
685	{	1021	{
686	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
687		1025
688	while (pairs--)	1026	while (pairs--)
689	decode_he (dec, hv);	1027	decode_he (dec, hv);
690	}	1028	}
691		1029
692	DEC_DEC_DEPTH;	1030	DEC_DEC_DEPTH;
693	return newRV_noinc ((SV *)hv);	1031	return newRV_noinc ((SV *)hv);
694		1032
695	fail:	1033	fail:
696	SvREFCNT_dec (hv);	1034	SvREFCNT_dec_NN (hv);
697	DEC_DEC_DEPTH;	1035	DEC_DEC_DEPTH;
698	return &PL_sv_undef;	1036	return &PL_sv_undef;
699	}	1037	}
700		1038
701	static SV *	1039	static SV *
702	decode_str (dec_t *dec, int utf8)	1040	decode_str (dec_t *dec, int utf8)
703	{	1041	{
704	SV *sv = 0;	1042	SV *sv = 0;
705		1043
706	if ((*dec->cur & 31) == 31)	1044	if (ecb_expect_false ((*dec->cur & MINOR_MASK) == MINOR_INDEF))
707	{	1045	{
		1046	// indefinite length strings
708	++dec->cur;	1047	++dec->cur;
709		1048
		1049	U8 major = *dec->cur & MAJOR_MISC;
		1050
710	sv = newSVpvn ("", 0);	1051	sv = newSVpvn ("", 0);
711		1052
712	// not very fast, and certainly not robust against illegal input
713	for (;;)	1053	for (;;)
714	{	1054	{
715	WANT (1);	1055	WANT (1);
716		1056
717	if (*dec->cur == (0xe0 | 31))	1057	if ((*dec->cur - major) > LENGTH_EXT8)
		1058	if (*dec->cur == (MAJOR_MISC | MINOR_INDEF))
718	{	1059	{
719	++dec->cur;	1060	++dec->cur;
720	break;	1061	break;
721	}	1062	}
		1063	else
		1064	ERR ("corrupted CBOR data (invalid chunks in indefinite length string)");
722		1065
723	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;
724	}	1071	}
725	}	1072	}
726	else	1073	else
727	{	1074	{
728	STRLEN len = decode_uint (dec);	1075	STRLEN len = decode_uint (dec);
729		1076
730	WANT (len);	1077	WANT (len);
731	sv = newSVpvn (dec->cur, len);	1078	sv = newSVpvn (dec->cur, len);
732	dec->cur += len;	1079	dec->cur += len;
		1080
		1081	if (ecb_expect_false (dec->stringref)
		1082	&& SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1))
		1083	av_push (dec->stringref, SvREFCNT_inc_NN (sv));
733	}	1084	}
734		1085
735	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
736	SvUTF8_on (sv);	1092	SvUTF8_on (sv);
		1093	}
737		1094
738	return sv;	1095	return sv;
739		1096
740	fail:	1097	fail:
741	SvREFCNT_dec (sv);	1098	SvREFCNT_dec (sv);
…		…
743	}	1100	}
744		1101
745	static SV *	1102	static SV *
746	decode_tagged (dec_t *dec)	1103	decode_tagged (dec_t *dec)
747	{	1104	{
		1105	SV *sv = 0;
748	UV tag = decode_uint (dec);	1106	UV tag = decode_uint (dec);
749	SV *sv = decode_sv (dec);	1107
		1108	WANT (1);
750		1109
751	switch (tag)	1110	switch (tag)
752	{	1111	{
753	case CBOR_TAG_MAGIC:	1112	case CBOR_TAG_MAGIC:
754	return sv;	1113	sv = decode_sv (dec);
		1114	break;
755		1115
756	case CBOR_TAG_INDIRECTION:	1116	case CBOR_TAG_INDIRECTION:
757	return newRV_noinc (sv);	1117	sv = newRV_noinc (decode_sv (dec));
		1118	break;
758		1119
		1120	case CBOR_TAG_STRINGREF_NAMESPACE:
		1121	{
		1122	// do not use SAVETMPS/FREETMPS, as these will
		1123	// erase mortalised caches, e.g. "shareable"
		1124	ENTER;
		1125
		1126	SAVESPTR (dec->stringref);
		1127	dec->stringref = (AV *)sv_2mortal ((SV *)newAV ());
		1128
		1129	sv = decode_sv (dec);
		1130
		1131	LEAVE;
		1132	}
		1133	break;
		1134
		1135	case CBOR_TAG_STRINGREF:
		1136	{
		1137	if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
		1138	ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
		1139
		1140	UV idx = decode_uint (dec);
		1141
		1142	if (!dec->stringref || idx >= (UV)(1 + AvFILLp (dec->stringref)))
		1143	ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)");
		1144
		1145	sv = newSVsv (AvARRAY (dec->stringref)[idx]);
		1146	}
		1147	break;
		1148
759	case CBOR_TAG_VALUE_SHARABLE:	1149	case CBOR_TAG_VALUE_SHAREABLE:
		1150	{
760	if (ecb_expect_false (!dec->sharable))	1151	if (ecb_expect_false (!dec->shareable))
761	dec->sharable = (AV *)sv_2mortal ((SV *)newAV ());	1152	dec->shareable = (AV *)sv_2mortal ((SV *)newAV ());
762		1153
		1154	if (dec->cbor.flags & F_ALLOW_CYCLES)
		1155	{
		1156	sv = newSV (0);
763	av_push (dec->sharable, SvREFCNT_inc_NN (sv));	1157	av_push (dec->shareable, SvREFCNT_inc_NN (sv));
764		1158
765	return sv;	1159	SV *osv = decode_sv (dec);
		1160	sv_setsv (sv, 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	}
		1170	}
		1171	break;
766		1172
767	case CBOR_TAG_VALUE_SHAREDREF:	1173	case CBOR_TAG_VALUE_SHAREDREF:
768	{	1174	{
769	// TODO: should verify that the sv atcually was a CBOR unsigned integer	1175	if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
770	UV idx = SvUV (sv);	1176	ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
771		1177
		1178	UV idx = decode_uint (dec);
		1179
772	if (!dec->sharable || idx > AvFILLp (dec->sharable))	1180	if (!dec->shareable || idx >= (UV)(1 + AvFILLp (dec->shareable)))
773	ERR ("corrupted CBOR data (sharedref index out of bounds)");	1181	ERR ("corrupted CBOR data (sharedref index out of bounds)");
774		1182
775	SvREFCNT_dec (sv);
776
777	return SvREFCNT_inc_NN (AvARRAY (dec->sharable)[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");
778	}	1187	}
		1188	break;
779		1189
780	case CBOR_TAG_PERL_OBJECT:	1190	case CBOR_TAG_PERL_OBJECT:
781	{	1191	{
		1192	if (dec->cbor.flags & F_FORBID_OBJECTS)
		1193	goto filter;
		1194
		1195	sv = decode_sv (dec);
		1196
782	if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)	1197	if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
783	ERR ("corrupted CBOR data (non-array perl object)");	1198	ERR ("corrupted CBOR data (non-array perl object)");
784		1199
785	AV *av = (AV *)SvRV (sv);	1200	AV *av = (AV *)SvRV (sv);
786	int len = av_len (av) + 1;	1201	int len = av_len (av) + 1;
…		…
794	if (!method)	1209	if (!method)
795	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)");
796		1211
797	dSP;	1212	dSP;
798		1213
799	ENTER; SAVETMPS; PUSHMARK (SP);	1214	ENTER; SAVETMPS;
		1215	PUSHMARK (SP);
800	EXTEND (SP, len + 1);	1216	EXTEND (SP, len + 1);
801	// 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
802	PUSHs (*av_fetch (av, 0, 1));	1218	PUSHs (*av_fetch (av, 0, 1));
803	PUSHs (sv_cbor);	1219	PUSHs (sv_cbor);
804		1220
…		…
812	SPAGAIN;	1228	SPAGAIN;
813		1229
814	if (SvTRUE (ERRSV))	1230	if (SvTRUE (ERRSV))
815	{	1231	{
816	FREETMPS; LEAVE;	1232	FREETMPS; LEAVE;
817	ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));	1233	ERR_ERRSV;
818	}	1234	}
819		1235
820	SvREFCNT_dec (sv);	1236	SvREFCNT_dec_NN (sv);
821	sv = SvREFCNT_inc (POPs);	1237	sv = SvREFCNT_inc (POPs);
822		1238
823	PUTBACK;	1239	PUTBACK;
824		1240
825	FREETMPS; LEAVE;	1241	FREETMPS; LEAVE;
826
827	return sv;
828	}	1242	}
		1243	break;
829		1244
830	default:	1245	default:
		1246	filter:
		1247	{
		1248	SV *tag_sv = newSVuv (tag);
		1249
		1250	sv = decode_sv (dec);
		1251
		1252	dSP;
		1253	ENTER; SAVETMPS;
		1254	PUSHMARK (SP);
		1255	EXTEND (SP, 2);
		1256	PUSHs (tag_sv);
		1257	PUSHs (sv);
		1258
		1259	PUTBACK;
		1260	int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL);
		1261	SPAGAIN;
		1262
		1263	if (SvTRUE (ERRSV))
831	{	1264	{
		1265	SvREFCNT_dec_NN (tag_sv);
		1266	FREETMPS; LEAVE;
		1267	ERR_ERRSV;
		1268	}
		1269
		1270	if (count)
		1271	{
		1272	SvREFCNT_dec_NN (tag_sv);
		1273	SvREFCNT_dec_NN (sv);
		1274	sv = SvREFCNT_inc_NN (TOPs);
		1275	SP -= count;
		1276	}
		1277	else
		1278	{
832	AV *av = newAV ();	1279	AV *av = newAV ();
833	av_push (av, newSVuv (tag));	1280	av_push (av, tag_sv);
834	av_push (av, sv);	1281	av_push (av, sv);
835		1282
836	HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash	1283	HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
837	? cbor_tagged_stash	1284	? cbor_tagged_stash
838	: gv_stashpv ("CBOR::XS::Tagged" , 1);	1285	: gv_stashpv ("CBOR::XS::Tagged" , 1);
839
840	return sv_bless (newRV_noinc ((SV *)av), tagged_stash);	1286	sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash);
841	}	1287	}
		1288
		1289	PUTBACK;
		1290
		1291	FREETMPS; LEAVE;
		1292	}
		1293	break;
842	}	1294	}
		1295
		1296	return sv;
843		1297
844	fail:	1298	fail:
845	SvREFCNT_dec (sv);	1299	SvREFCNT_dec (sv);
846	return &PL_sv_undef;	1300	return &PL_sv_undef;
847	}	1301	}
…		…
849	static SV *	1303	static SV *
850	decode_sv (dec_t *dec)	1304	decode_sv (dec_t *dec)
851	{	1305	{
852	WANT (1);	1306	WANT (1);
853		1307
854	switch (*dec->cur >> 5)	1308	switch (*dec->cur >> MAJOR_SHIFT)
855	{	1309	{
856	case 0: // unsigned int	1310	case MAJOR_POS_INT >> MAJOR_SHIFT: return newSVuv (decode_uint (dec));
857	return newSVuv (decode_uint (dec));	1311	case MAJOR_NEG_INT >> MAJOR_SHIFT: return newSViv (-1 - (IV)decode_uint (dec));
858	case 1: // negative int	1312	case MAJOR_BYTES >> MAJOR_SHIFT: return decode_str (dec, 0);
859	return newSViv (-1 - (IV)decode_uint (dec));	1313	case MAJOR_TEXT >> MAJOR_SHIFT: return decode_str (dec, 1);
860	case 2: // octet string	1314	case MAJOR_ARRAY >> MAJOR_SHIFT: return decode_av (dec);
861	return decode_str (dec, 0);	1315	case MAJOR_MAP >> MAJOR_SHIFT: return decode_hv (dec);
862	case 3: // utf-8 string	1316	case MAJOR_TAG >> MAJOR_SHIFT: return decode_tagged (dec);
863	return decode_str (dec, 1);	1317
864	case 4: // array	1318	case MAJOR_MISC >> MAJOR_SHIFT:
865	return decode_av (dec);
866	case 5: // map
867	return decode_hv (dec);
868	case 6: // tag
869	return decode_tagged (dec);
870	case 7: // misc
871	switch (*dec->cur++ & 31)	1319	switch (*dec->cur++ & MINOR_MASK)
872	{	1320	{
873	case 20:	1321	case SIMPLE_FALSE:
874	#if CBOR_SLOW	1322	#if CBOR_SLOW
875	types_false = get_bool ("Types::Serialiser::false");	1323	types_false = get_bool ("Types::Serialiser::false");
876	#endif	1324	#endif
877	return newSVsv (types_false);	1325	return newSVsv (types_false);
878	case 21:	1326	case SIMPLE_TRUE:
879	#if CBOR_SLOW	1327	#if CBOR_SLOW
880	types_true = get_bool ("Types::Serialiser::true");	1328	types_true = get_bool ("Types::Serialiser::true");
881	#endif	1329	#endif
882	return newSVsv (types_true);	1330	return newSVsv (types_true);
883	case 22:	1331	case SIMPLE_NULL:
884	return newSVsv (&PL_sv_undef);	1332	return newSVsv (&PL_sv_undef);
885	case 23:	1333	case SIMPLE_UNDEF:
886	#if CBOR_SLOW	1334	#if CBOR_SLOW
887	types_error = get_bool ("Types::Serialiser::error");	1335	types_error = get_bool ("Types::Serialiser::error");
888	#endif	1336	#endif
889	return newSVsv (types_error);	1337	return newSVsv (types_error);
890		1338
891	case 25:	1339	case MISC_FLOAT16:
892	{	1340	{
893	WANT (2);	1341	WANT (2);
894		1342
895	uint16_t fp = (dec->cur[0] << 8) | dec->cur[1];	1343	uint16_t fp = (dec->cur[0] << 8) | dec->cur[1];
896	dec->cur += 2;	1344	dec->cur += 2;
897		1345
898	return newSVnv (ecb_binary16_to_float (fp));	1346	return newSVnv (ecb_binary16_to_float (fp));
899	}	1347	}
900		1348
901	case 26:	1349	case MISC_FLOAT32:
902	{	1350	{
903	uint32_t fp;	1351	uint32_t fp;
904	WANT (4);	1352	WANT (4);
905	memcpy (&fp, dec->cur, 4);	1353	memcpy (&fp, dec->cur, 4);
906	dec->cur += 4;	1354	dec->cur += 4;
…		…
909	fp = ecb_bswap32 (fp);	1357	fp = ecb_bswap32 (fp);
910		1358
911	return newSVnv (ecb_binary32_to_float (fp));	1359	return newSVnv (ecb_binary32_to_float (fp));
912	}	1360	}
913		1361
914	case 27:	1362	case MISC_FLOAT64:
915	{	1363	{
916	uint64_t fp;	1364	uint64_t fp;
917	WANT (8);	1365	WANT (8);
918	memcpy (&fp, dec->cur, 8);	1366	memcpy (&fp, dec->cur, 8);
919	dec->cur += 8;	1367	dec->cur += 8;
…		…
922	fp = ecb_bswap64 (fp);	1370	fp = ecb_bswap64 (fp);
923		1371
924	return newSVnv (ecb_binary64_to_double (fp));	1372	return newSVnv (ecb_binary64_to_double (fp));
925	}	1373	}
926		1374
927	// 0..19 unassigned	1375	// 0..19 unassigned simple
928	// 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
929	default:	1379	default:
930	ERR ("corrupted CBOR data (reserved/unassigned major 7 value)");	1380	ERR ("corrupted CBOR data (reserved/unassigned/unexpected major 7 value)");
931	}	1381	}
932		1382
933	break;	1383	break;
934	}	1384	}
935		1385
…		…
938	}	1388	}
939		1389
940	static SV *	1390	static SV *
941	decode_cbor (SV *string, CBOR *cbor, char **offset_return)	1391	decode_cbor (SV *string, CBOR *cbor, char **offset_return)
942	{	1392	{
943	dec_t dec = { };	1393	dec_t dec = { 0 };
944	SV *sv;	1394	SV *sv;
945	STRLEN len;	1395	STRLEN len;
946	char *data = SvPVbyte (string, len);	1396	char *data = SvPVbyte (string, len);
947		1397
948	if (len > cbor->max_size && cbor->max_size)	1398	if (len > cbor->max_size && cbor->max_size)
…		…
962	if (dec.cur != dec.end && !dec.err)	1412	if (dec.cur != dec.end && !dec.err)
963	dec.err = "garbage after CBOR object";	1413	dec.err = "garbage after CBOR object";
964		1414
965	if (dec.err)	1415	if (dec.err)
966	{	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
967	SvREFCNT_dec (sv);	1428	SvREFCNT_dec_NN (sv);
		1429
		1430	if (dec.err_sv)
		1431	sv_2mortal (dec.err_sv);
		1432
968	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);
969	}	1434	}
970		1435
971	sv = sv_2mortal (sv);	1436	sv = sv_2mortal (sv);
972		1437
973	return sv;	1438	return sv;
974	}	1439	}
975		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
976	/////////////////////////////////////////////////////////////////////////////	1565	/////////////////////////////////////////////////////////////////////////////
977	// XS interface functions	1566	// XS interface functions
978		1567
979	MODULE = CBOR::XS PACKAGE = CBOR::XS	1568	MODULE = CBOR::XS PACKAGE = CBOR::XS
980		1569
…		…
988		1577
989	types_true = get_bool ("Types::Serialiser::true" );	1578	types_true = get_bool ("Types::Serialiser::true" );
990	types_false = get_bool ("Types::Serialiser::false");	1579	types_false = get_bool ("Types::Serialiser::false");
991	types_error = get_bool ("Types::Serialiser::error");	1580	types_error = get_bool ("Types::Serialiser::error");
992		1581
		1582	default_filter = newSVpv ("CBOR::XS::default_filter", 0);
		1583
993	sv_cbor = newSVpv ("CBOR", 0);	1584	sv_cbor = newSVpv ("CBOR", 0);
994	SvREADONLY_on (sv_cbor);	1585	SvREADONLY_on (sv_cbor);
		1586
		1587	assert (("STRLEN must be an unsigned type", 0 <= (STRLEN)-1));
995	}	1588	}
996		1589
997	PROTOTYPES: DISABLE	1590	PROTOTYPES: DISABLE
998		1591
999	void CLONE (...)	1592	void CLONE (...)
…		…
1018	void shrink (CBOR *self, int enable = 1)	1611	void shrink (CBOR *self, int enable = 1)
1019	ALIAS:	1612	ALIAS:
1020	shrink = F_SHRINK	1613	shrink = F_SHRINK
1021	allow_unknown = F_ALLOW_UNKNOWN	1614	allow_unknown = F_ALLOW_UNKNOWN
1022	allow_sharing = F_ALLOW_SHARING	1615	allow_sharing = F_ALLOW_SHARING
1023	dedup_keys = F_DEDUP_KEYS	1616	allow_cycles = F_ALLOW_CYCLES
		1617	forbid_objects = F_FORBID_OBJECTS
1024	dedup_strings = F_DEDUP_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
1025	PPCODE:	1622	PPCODE:
1026	{	1623	{
1027	if (enable)	1624	if (enable)
1028	self->flags |= ix;	1625	self->flags |= ix;
1029	else	1626	else
…		…
1035	void get_shrink (CBOR *self)	1632	void get_shrink (CBOR *self)
1036	ALIAS:	1633	ALIAS:
1037	get_shrink = F_SHRINK	1634	get_shrink = F_SHRINK
1038	get_allow_unknown = F_ALLOW_UNKNOWN	1635	get_allow_unknown = F_ALLOW_UNKNOWN
1039	get_allow_sharing = F_ALLOW_SHARING	1636	get_allow_sharing = F_ALLOW_SHARING
1040	get_dedup_keys = F_DEDUP_KEYS	1637	get_allow_cycles = F_ALLOW_CYCLES
		1638	get_forbid_objects = F_FORBID_OBJECTS
1041	get_dedup_strings = F_DEDUP_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
1042	PPCODE:	1643	PPCODE:
1043	XPUSHs (boolSV (self->flags & ix));	1644	XPUSHs (boolSV (self->flags & ix));
1044		1645
1045	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)	1646	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
1046	PPCODE:	1647	PPCODE:
…		…
1059	XPUSHs (ST (0));	1660	XPUSHs (ST (0));
1060		1661
1061	int get_max_size (CBOR *self)	1662	int get_max_size (CBOR *self)
1062	CODE:	1663	CODE:
1063	RETVAL = self->max_size;	1664	RETVAL = self->max_size;
		1665	OUTPUT:
		1666	RETVAL
		1667
		1668	void filter (CBOR *self, SV *filter = 0)
		1669	PPCODE:
		1670	SvREFCNT_dec (self->filter);
		1671	self->filter = filter ? newSVsv (filter) : filter;
		1672	XPUSHs (ST (0));
		1673
		1674	SV *get_filter (CBOR *self)
		1675	CODE:
		1676	RETVAL = self->filter ? self->filter : NEWSV (0, 0);
1064	OUTPUT:	1677	OUTPUT:
1065	RETVAL	1678	RETVAL
1066		1679
1067	void encode (CBOR *self, SV *scalar)	1680	void encode (CBOR *self, SV *scalar)
1068	PPCODE:	1681	PPCODE:
…		…
1083	EXTEND (SP, 2);	1696	EXTEND (SP, 2);
1084	PUSHs (sv);	1697	PUSHs (sv);
1085	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));	1698	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1086	}	1699	}
1087		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
		1753	void DESTROY (CBOR *self)
		1754	PPCODE:
		1755	cbor_free (self);
		1756
1088	PROTOTYPES: ENABLE	1757	PROTOTYPES: ENABLE
1089		1758
1090	void encode_cbor (SV *scalar)	1759	void encode_cbor (SV *scalar)
		1760	ALIAS:
		1761	encode_cbor = 0
		1762	encode_cbor_sharing = F_ALLOW_SHARING
1091	PPCODE:	1763	PPCODE:
1092	{	1764	{
1093	CBOR cbor;	1765	CBOR cbor;
1094	cbor_init (&cbor);	1766	cbor_init (&cbor);
		1767	cbor.flags |= ix;
1095	PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN;	1768	PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN;
1096	XPUSHs (scalar);	1769	XPUSHs (scalar);
1097	}	1770	}
1098		1771
1099	void decode_cbor (SV *cborstr)	1772	void decode_cbor (SV *cborstr)
…		…
1103	cbor_init (&cbor);	1776	cbor_init (&cbor);
1104	PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN;	1777	PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN;
1105	XPUSHs (cborstr);	1778	XPUSHs (cborstr);
1106	}	1779	}
1107		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