ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/CBOR-XS/XS.xs

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

Diff Legend

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