ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/CBOR-XS/XS.xs

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.30 by root, Thu Nov 28 11:36:53 2013 UTC vs.
Revision 1.72 by root, Thu Oct 21 01:14:58 2021 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 //TODO	123	#define F_ALLOW_SHARING 0x00000004UL
65	#define F_ALLOW_STRINGREF 0x00000008UL //TODO	124	#define F_ALLOW_CYCLES 0x00000008UL
		125	#define F_FORBID_OBJECTS 0x00000010UL
		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 (len < 24)	263	if (ecb_expect_true (len < LENGTH_EXT1))
195	*enc->cur++ = major | len;	264	*enc->cur++ = major | len;
196	else if (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_ALLOW_STRINGREF))	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.
327	static void	574	static void
328	encode_rv (enc_t *enc, SV *sv)	575	encode_rv (enc_t *enc, SV *sv)
329	{	576	{
330	SvGETMAGIC (sv);	577	SvGETMAGIC (sv);
331
332	if (ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)
333	&& ecb_expect_false (SvREFCNT (sv) > 1))
334	{
335	if (!enc->shareable)
336	enc->shareable = (HV *)sv_2mortal ((SV *)newHV ());
337
338	SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1);
339
340	if (SvOK (*svp))
341	{
342	encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
343	encode_uint (enc, 0x00, SvUV (*svp));
344	return;
345	}
346	else
347	{
348	sv_setuv (*svp, enc->shareable_idx);
349	++enc->shareable_idx;
350	encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
351	}
352	}
353		578
354	svtype svt = SvTYPE (sv);	579	svtype svt = SvTYPE (sv);
355		580
356	if (ecb_expect_false (SvOBJECT (sv)))	581	if (ecb_expect_false (SvOBJECT (sv)))
357	{	582	{
…		…
364	HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash	589	HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
365	? cbor_tagged_stash	590	? cbor_tagged_stash
366	: gv_stashpv ("CBOR::XS::Tagged" , 1);	591	: gv_stashpv ("CBOR::XS::Tagged" , 1);
367		592
368	HV *stash = SvSTASH (sv);	593	HV *stash = SvSTASH (sv);
369	GV *method;
370		594
371	if (stash == boolean_stash)	595	if (stash == boolean_stash)
372	encode_ch (enc, SvIV (sv) ? 0xe0 | 21 : 0xe0 | 20);	596	{
		597	encode_bool (enc, SvIV (sv));
		598	return;
		599	}
373	else if (stash == error_stash)	600	else if (stash == error_stash)
374	encode_ch (enc, 0xe0 | 23);	601	{
		602	encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF);
		603	return;
		604	}
375	else if (stash == tagged_stash)	605	else if (stash == tagged_stash)
376	{	606	{
377	if (svt != SVt_PVAV)	607	if (svt != SVt_PVAV)
378	croak ("encountered CBOR::XS::Tagged object that isn't an array");	608	croak ("encountered CBOR::XS::Tagged object that isn't an array");
379		609
		610	switch (av_len ((AV *)sv))
		611	{
		612	case 2-1:
		613	// actually a tagged value
380	encode_uint (enc, 0xc0, SvUV (*av_fetch ((AV *)sv, 0, 1)));	614	encode_uint (enc, MAJOR_TAG, SvUV (*av_fetch ((AV *)sv, 0, 1)));
381	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))
382	}	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))));
383	else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))	661	else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
384	{	662	{
385	dSP;	663	dSP;
386		664
387	ENTER; SAVETMPS; PUSHMARK (SP);	665	ENTER; SAVETMPS;
		666	PUSHMARK (SP);
388	// 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
389	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));	668	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
390		669
391	PUTBACK;	670	PUTBACK;
392	// G_SCALAR ensures that return value is 1	671	// G_SCALAR ensures that return value is 1
…		…
405	}	684	}
406	else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)	685	else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
407	{	686	{
408	dSP;	687	dSP;
409		688
410	ENTER; SAVETMPS; PUSHMARK (SP);	689	ENTER; SAVETMPS;
		690	PUSHMARK (SP);
411	EXTEND (SP, 2);	691	EXTEND (SP, 2);
412	// 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
413	PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));	693	PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
414	PUSHs (sv_cbor);	694	PUSHs (sv_cbor);
415		695
…		…
420	// catch this surprisingly common error	700	// catch this surprisingly common error
421	if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)	701	if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
422	croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));	702	croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
423		703
424	encode_tag (enc, CBOR_TAG_PERL_OBJECT);	704	encode_tag (enc, CBOR_TAG_PERL_OBJECT);
425	encode_uint (enc, 0x80, count + 1);	705	encode_uint (enc, MAJOR_ARRAY, count + 1);
426	encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));	706	encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
427		707
428	while (count)	708	{
		709	int i;
		710
		711	for (i = 0; i < count; ++i)
429	encode_sv (enc, SP[1 - count--]);	712	encode_sv (enc, SP[i + 1 - count]);
		713
		714	SP -= count;
		715	}
430		716
431	PUTBACK;	717	PUTBACK;
432		718
433	FREETMPS; LEAVE;	719	FREETMPS; LEAVE;
434	}	720	}
…		…
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_ALLOW_STRINGREF)	790	if (cbor->flags & F_PACK_STRINGS)
532	{	791	{
533	encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE);	792	encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE);
534	enc.stringref[0]= (HV *)sv_2mortal ((SV *)newHV ());	793	enc.stringref[0]= (HV *)sv_2mortal ((SV *)newHV ());
535	enc.stringref[1]= (HV *)sv_2mortal ((SV *)newHV ());	794	enc.stringref[1]= (HV *)sv_2mortal ((SV *)newHV ());
536	}	795	}
…		…
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;
		990	printf ("len %d\n", len);//D
692		991
		992	WANT (len);
693	dec->cur += len;	993	dec->cur += len;
694		994
695	if (ecb_expect_false (dec->stringref))	995	if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
696	av_push (dec->stringref, newSVpvn_utf8 (key, len, 1));	996	if (!cbor_is_utf8_string ((U8 *)key, len))
		997	ERR ("corrupted CBOR data (invalid UTF-8 in map key)");
697		998
698	hv_store (hv, key, -len, decode_sv (dec), 0);	999	hv_store (hv, key, -len, decode_sv (dec), 0);
699		1000
700	return;	1001	return;
701	}	1002	}
702		1003
703	SV *k = decode_sv (dec);	1004	SV *k = decode_sv (dec);
704	SV *v = decode_sv (dec);	1005	SV *v = decode_sv (dec);
705		1006
		1007	// we leak memory if uncaught exceptions are thrown by random magical
		1008	// methods, and this is hopefully the only place where it can happen,
		1009	// so if there is a chance of an exception, take the very slow path.
		1010	// since catching exceptions is "undocumented/internal/forbidden" by
		1011	// the new p5p powers, we need to call out to a perl function :/
		1012	if (ecb_expect_false (SvAMAGIC (k)))
		1013	{
		1014	dSP;
		1015
		1016	ENTER; SAVETMPS;
		1017	PUSHMARK (SP);
		1018	EXTEND (SP, 3);
		1019	PUSHs (sv_2mortal (newRV_inc ((SV *)hv)));
		1020	PUSHs (sv_2mortal (k));
		1021	PUSHs (sv_2mortal (v));
		1022
		1023	PUTBACK;
		1024	call_pv ("CBOR::XS::_hv_store", G_VOID | G_DISCARD | G_EVAL);
		1025	SPAGAIN;
		1026
		1027	FREETMPS; LEAVE;
		1028
		1029	if (SvTRUE (ERRSV))
		1030	ERR_ERRSV;
		1031
		1032	return;
		1033	}
		1034
706	hv_store_ent (hv, k, v, 0);	1035	hv_store_ent (hv, k, v, 0);
707	SvREFCNT_dec (k);	1036	SvREFCNT_dec_NN (k);
		1037
		1038	fail:
		1039	;
708	}	1040	}
709		1041
710	static SV *	1042	static SV *
711	decode_hv (dec_t *dec)	1043	decode_hv (dec_t *dec)
712	{	1044	{
713	HV *hv = newHV ();	1045	HV *hv = newHV ();
714		1046
715	DEC_INC_DEPTH;	1047	DEC_INC_DEPTH;
716		1048
717	if ((*dec->cur & 31) == 31)	1049	if (*dec->cur == (MAJOR_MAP | MINOR_INDEF))
718	{	1050	{
719	++dec->cur;	1051	++dec->cur;
720		1052
721	for (;;)	1053	for (;;)
722	{	1054	{
723	WANT (1);	1055	WANT (1);
724		1056
725	if (*dec->cur == (0xe0 | 31))	1057	if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
726	{	1058	{
727	++dec->cur;	1059	++dec->cur;
728	break;	1060	break;
729	}	1061	}
730		1062
731	decode_he (dec, hv);	1063	decode_he (dec, hv);
732	}	1064	}
733	}	1065	}
734	else	1066	else
735	{	1067	{
736	int pairs = decode_uint (dec);	1068	UV pairs = decode_uint (dec);
		1069
		1070	WANT (pairs); // complexity check - need at least one byte per value, do not allow supersize hashes
737		1071
738	while (pairs--)	1072	while (pairs--)
739	decode_he (dec, hv);	1073	decode_he (dec, hv);
740	}	1074	}
741		1075
742	DEC_DEC_DEPTH;	1076	DEC_DEC_DEPTH;
743	return newRV_noinc ((SV *)hv);	1077	return newRV_noinc ((SV *)hv);
744		1078
745	fail:	1079	fail:
746	SvREFCNT_dec (hv);	1080	SvREFCNT_dec_NN (hv);
747	DEC_DEC_DEPTH;	1081	DEC_DEC_DEPTH;
748	return &PL_sv_undef;	1082	return &PL_sv_undef;
749	}	1083	}
750		1084
751	static SV *	1085	static SV *
752	decode_str (dec_t *dec, int utf8)	1086	decode_str (dec_t *dec, int utf8)
753	{	1087	{
754	SV *sv = 0;	1088	SV *sv = 0;
755		1089
756	if ((*dec->cur & 31) == 31)	1090	if (ecb_expect_false ((*dec->cur & MINOR_MASK) == MINOR_INDEF))
757	{	1091	{
		1092	// indefinite length strings
758	++dec->cur;	1093	++dec->cur;
759		1094
		1095	U8 major = *dec->cur & MAJOR_MISC;
		1096
760	sv = newSVpvn ("", 0);	1097	sv = newSVpvn ("", 0);
761		1098
762	// not very fast, and certainly not robust against illegal input
763	for (;;)	1099	for (;;)
764	{	1100	{
765	WANT (1);	1101	WANT (1);
766		1102
767	if (*dec->cur == (0xe0 | 31))	1103	if ((*dec->cur - major) > LENGTH_EXT8)
		1104	if (*dec->cur == (MAJOR_MISC | MINOR_INDEF))
768	{	1105	{
769	++dec->cur;	1106	++dec->cur;
770	break;	1107	break;
771	}	1108	}
		1109	else
		1110	ERR ("corrupted CBOR data (invalid chunks in indefinite length string)");
772		1111
773	sv_catsv (sv, decode_sv (dec));	1112	STRLEN len = decode_uint (dec);
		1113
		1114	WANT (len);
		1115	sv_catpvn (sv, dec->cur, len);
		1116	dec->cur += len;
774	}	1117	}
775	}	1118	}
776	else	1119	else
777	{	1120	{
778	STRLEN len = decode_uint (dec);	1121	STRLEN len = decode_uint (dec);
…		…
785	&& SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1))	1128	&& SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1))
786	av_push (dec->stringref, SvREFCNT_inc_NN (sv));	1129	av_push (dec->stringref, SvREFCNT_inc_NN (sv));
787	}	1130	}
788		1131
789	if (utf8)	1132	if (utf8)
		1133	{
		1134	if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
		1135	if (!cbor_is_utf8_string (SvPVX (sv), SvCUR (sv)))
		1136	ERR ("corrupted CBOR data (invalid UTF-8 in text string)");
		1137
790	SvUTF8_on (sv);	1138	SvUTF8_on (sv);
		1139	}
791		1140
792	return sv;	1141	return sv;
793		1142
794	fail:	1143	fail:
795	SvREFCNT_dec (sv);	1144	SvREFCNT_dec (sv);
…		…
814	sv = newRV_noinc (decode_sv (dec));	1163	sv = newRV_noinc (decode_sv (dec));
815	break;	1164	break;
816		1165
817	case CBOR_TAG_STRINGREF_NAMESPACE:	1166	case CBOR_TAG_STRINGREF_NAMESPACE:
818	{	1167	{
		1168	// do not use SAVETMPS/FREETMPS, as these will
		1169	// erase mortalised caches, e.g. "shareable"
819	ENTER; SAVETMPS;	1170	ENTER;
820		1171
821	SAVESPTR (dec->stringref);	1172	SAVESPTR (dec->stringref);
822	dec->stringref = (AV *)sv_2mortal ((SV *)newAV ());	1173	dec->stringref = (AV *)sv_2mortal ((SV *)newAV ());
823		1174
824	sv = decode_sv (dec);	1175	sv = decode_sv (dec);
825		1176
826	FREETMPS; LEAVE;	1177	LEAVE;
827	}	1178	}
828	break;	1179	break;
829		1180
830	case CBOR_TAG_STRINGREF:	1181	case CBOR_TAG_STRINGREF:
831	{	1182	{
832	if ((*dec->cur >> 5) != 0)	1183	if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
833	ERR ("corrupted CBOR data (stringref index not an unsigned integer)");	1184	ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
834		1185
835	UV idx = decode_uint (dec);	1186	UV idx = decode_uint (dec);
836		1187
837	if (!dec->stringref || (int)idx > AvFILLp (dec->stringref))	1188	if (!dec->stringref || idx >= (UV)(1 + AvFILLp (dec->stringref)))
838	ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)");	1189	ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)");
839		1190
840	sv = newSVsv (AvARRAY (dec->stringref)[idx]);	1191	sv = newSVsv (AvARRAY (dec->stringref)[idx]);
841	}	1192	}
842	break;	1193	break;
…		…
844	case CBOR_TAG_VALUE_SHAREABLE:	1195	case CBOR_TAG_VALUE_SHAREABLE:
845	{	1196	{
846	if (ecb_expect_false (!dec->shareable))	1197	if (ecb_expect_false (!dec->shareable))
847	dec->shareable = (AV *)sv_2mortal ((SV *)newAV ());	1198	dec->shareable = (AV *)sv_2mortal ((SV *)newAV ());
848		1199
		1200	if (dec->cbor.flags & F_ALLOW_CYCLES)
		1201	{
849	sv = newSV (0);	1202	sv = newSV (0);
850	av_push (dec->shareable, SvREFCNT_inc_NN (sv));	1203	av_push (dec->shareable, SvREFCNT_inc_NN (sv));
851		1204
852	SV *osv = decode_sv (dec);	1205	SV *osv = decode_sv (dec);
853	sv_setsv (sv, osv);	1206	sv_setsv (sv, osv);
854	SvREFCNT_dec_NN (osv);	1207	SvREFCNT_dec_NN (osv);
		1208	}
		1209	else
		1210	{
		1211	av_push (dec->shareable, &PL_sv_undef);
		1212	int idx = AvFILLp (dec->shareable);
		1213	sv = decode_sv (dec);
		1214	av_store (dec->shareable, idx, SvREFCNT_inc_NN (sv));
		1215	}
855	}	1216	}
856	break;	1217	break;
857		1218
858	case CBOR_TAG_VALUE_SHAREDREF:	1219	case CBOR_TAG_VALUE_SHAREDREF:
859	{	1220	{
860	if ((*dec->cur >> 5) != 0)	1221	if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
861	ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");	1222	ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
862		1223
863	UV idx = decode_uint (dec);	1224	UV idx = decode_uint (dec);
864		1225
865	if (!dec->shareable || (int)idx > AvFILLp (dec->shareable))	1226	if (!dec->shareable || idx >= (UV)(1 + AvFILLp (dec->shareable)))
866	ERR ("corrupted CBOR data (sharedref index out of bounds)");	1227	ERR ("corrupted CBOR data (sharedref index out of bounds)");
867		1228
868	sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);	1229	sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
		1230
		1231	if (sv == &PL_sv_undef)
		1232	ERR ("cyclic CBOR data structure found, but allow_cycles is not enabled");
869	}	1233	}
870	break;	1234	break;
871		1235
872	case CBOR_TAG_PERL_OBJECT:	1236	case CBOR_TAG_PERL_OBJECT:
873	{	1237	{
		1238	if (dec->cbor.flags & F_FORBID_OBJECTS)
		1239	goto filter;
		1240
874	sv = decode_sv (dec);	1241	sv = decode_sv (dec);
875		1242
876	if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)	1243	if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
877	ERR ("corrupted CBOR data (non-array perl object)");	1244	ERR ("corrupted CBOR data (non-array perl object)");
878		1245
…		…
888	if (!method)	1255	if (!method)
889	ERR ("cannot decode perl-object (package does not have a THAW method)");	1256	ERR ("cannot decode perl-object (package does not have a THAW method)");
890		1257
891	dSP;	1258	dSP;
892		1259
893	ENTER; SAVETMPS; PUSHMARK (SP);	1260	ENTER; SAVETMPS;
		1261	PUSHMARK (SP);
894	EXTEND (SP, len + 1);	1262	EXTEND (SP, len + 1);
895	// we re-bless the reference to get overload and other niceties right	1263	// we re-bless the reference to get overload and other niceties right
896	PUSHs (*av_fetch (av, 0, 1));	1264	PUSHs (*av_fetch (av, 0, 1));
897	PUSHs (sv_cbor);	1265	PUSHs (sv_cbor);
898		1266
…		…
906	SPAGAIN;	1274	SPAGAIN;
907		1275
908	if (SvTRUE (ERRSV))	1276	if (SvTRUE (ERRSV))
909	{	1277	{
910	FREETMPS; LEAVE;	1278	FREETMPS; LEAVE;
911	ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));	1279	ERR_ERRSV;
912	}	1280	}
913		1281
914	SvREFCNT_dec (sv);	1282	SvREFCNT_dec_NN (sv);
915	sv = SvREFCNT_inc (POPs);	1283	sv = SvREFCNT_inc (POPs);
916		1284
917	PUTBACK;	1285	PUTBACK;
918		1286
919	FREETMPS; LEAVE;	1287	FREETMPS; LEAVE;
920	}	1288	}
921	break;	1289	break;
922		1290
923	default:	1291	default:
		1292	filter:
924	{	1293	{
		1294	SV *tag_sv = newSVuv (tag);
		1295
925	sv = decode_sv (dec);	1296	sv = decode_sv (dec);
926		1297
927	dSP;	1298	dSP;
928	ENTER; SAVETMPS; PUSHMARK (SP);	1299	ENTER; SAVETMPS;
		1300	PUSHMARK (SP);
929	EXTEND (SP, 2);	1301	EXTEND (SP, 2);
930	PUSHs (newSVuv (tag));	1302	PUSHs (tag_sv);
931	PUSHs (sv);	1303	PUSHs (sv);
932		1304
933	PUTBACK;	1305	PUTBACK;
934	int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL);	1306	int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL);
935	SPAGAIN;	1307	SPAGAIN;
936		1308
937	if (SvTRUE (ERRSV))	1309	if (SvTRUE (ERRSV))
938	{	1310	{
		1311	SvREFCNT_dec_NN (tag_sv);
939	FREETMPS; LEAVE;	1312	FREETMPS; LEAVE;
940	ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));	1313	ERR_ERRSV;
941	}	1314	}
942		1315
943	if (count)	1316	if (count)
944	{	1317	{
		1318	SvREFCNT_dec_NN (tag_sv);
945	SvREFCNT_dec (sv);	1319	SvREFCNT_dec_NN (sv);
946	sv = SvREFCNT_inc (POPs);	1320	sv = SvREFCNT_inc_NN (TOPs);
		1321	SP -= count;
947	}	1322	}
948	else	1323	else
949	{	1324	{
950	AV *av = newAV ();	1325	AV *av = newAV ();
951	av_push (av, newSVuv (tag));	1326	av_push (av, tag_sv);
952	av_push (av, sv);	1327	av_push (av, sv);
953		1328
954	HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash	1329	HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
955	? cbor_tagged_stash	1330	? cbor_tagged_stash
956	: gv_stashpv ("CBOR::XS::Tagged" , 1);	1331	: gv_stashpv ("CBOR::XS::Tagged" , 1);
…		…
974	static SV *	1349	static SV *
975	decode_sv (dec_t *dec)	1350	decode_sv (dec_t *dec)
976	{	1351	{
977	WANT (1);	1352	WANT (1);
978		1353
979	switch (*dec->cur >> 5)	1354	switch (*dec->cur >> MAJOR_SHIFT)
980	{	1355	{
981	case 0: // unsigned int	1356	case MAJOR_POS_INT >> MAJOR_SHIFT: return newSVuv (decode_uint (dec));
982	return newSVuv (decode_uint (dec));	1357	case MAJOR_NEG_INT >> MAJOR_SHIFT: return newSViv (-1 - (IV)decode_uint (dec));
983	case 1: // negative int	1358	case MAJOR_BYTES >> MAJOR_SHIFT: return decode_str (dec, 0);
984	return newSViv (-1 - (IV)decode_uint (dec));	1359	case MAJOR_TEXT >> MAJOR_SHIFT: return decode_str (dec, 1);
985	case 2: // octet string	1360	case MAJOR_ARRAY >> MAJOR_SHIFT: return decode_av (dec);
986	return decode_str (dec, 0);	1361	case MAJOR_MAP >> MAJOR_SHIFT: return decode_hv (dec);
987	case 3: // utf-8 string	1362	case MAJOR_TAG >> MAJOR_SHIFT: return decode_tagged (dec);
988	return decode_str (dec, 1);	1363
989	case 4: // array	1364	case MAJOR_MISC >> MAJOR_SHIFT:
990	return decode_av (dec);
991	case 5: // map
992	return decode_hv (dec);
993	case 6: // tag
994	return decode_tagged (dec);
995	case 7: // misc
996	switch (*dec->cur++ & 31)	1365	switch (*dec->cur++ & MINOR_MASK)
997	{	1366	{
998	case 20:	1367	case SIMPLE_FALSE:
999	#if CBOR_SLOW	1368	#if CBOR_SLOW
1000	types_false = get_bool ("Types::Serialiser::false");	1369	types_false = get_bool ("Types::Serialiser::false");
1001	#endif	1370	#endif
1002	return newSVsv (types_false);	1371	return newSVsv (types_false);
1003	case 21:	1372	case SIMPLE_TRUE:
1004	#if CBOR_SLOW	1373	#if CBOR_SLOW
1005	types_true = get_bool ("Types::Serialiser::true");	1374	types_true = get_bool ("Types::Serialiser::true");
1006	#endif	1375	#endif
1007	return newSVsv (types_true);	1376	return newSVsv (types_true);
1008	case 22:	1377	case SIMPLE_NULL:
1009	return newSVsv (&PL_sv_undef);	1378	return newSVsv (&PL_sv_undef);
1010	case 23:	1379	case SIMPLE_UNDEF:
1011	#if CBOR_SLOW	1380	#if CBOR_SLOW
1012	types_error = get_bool ("Types::Serialiser::error");	1381	types_error = get_bool ("Types::Serialiser::error");
1013	#endif	1382	#endif
1014	return newSVsv (types_error);	1383	return newSVsv (types_error);
1015		1384
1016	case 25:	1385	case MISC_FLOAT16:
1017	{	1386	{
1018	WANT (2);	1387	WANT (2);
1019		1388
1020	uint16_t fp = (dec->cur[0] << 8) | dec->cur[1];	1389	uint16_t fp = (dec->cur[0] << 8) | dec->cur[1];
1021	dec->cur += 2;	1390	dec->cur += 2;
1022		1391
1023	return newSVnv (ecb_binary16_to_float (fp));	1392	return newSVnv (ecb_binary16_to_float (fp));
1024	}	1393	}
1025		1394
1026	case 26:	1395	case MISC_FLOAT32:
1027	{	1396	{
1028	uint32_t fp;	1397	uint32_t fp;
1029	WANT (4);	1398	WANT (4);
1030	memcpy (&fp, dec->cur, 4);	1399	memcpy (&fp, dec->cur, 4);
1031	dec->cur += 4;	1400	dec->cur += 4;
…		…
1034	fp = ecb_bswap32 (fp);	1403	fp = ecb_bswap32 (fp);
1035		1404
1036	return newSVnv (ecb_binary32_to_float (fp));	1405	return newSVnv (ecb_binary32_to_float (fp));
1037	}	1406	}
1038		1407
1039	case 27:	1408	case MISC_FLOAT64:
1040	{	1409	{
1041	uint64_t fp;	1410	uint64_t fp;
1042	WANT (8);	1411	WANT (8);
1043	memcpy (&fp, dec->cur, 8);	1412	memcpy (&fp, dec->cur, 8);
1044	dec->cur += 8;	1413	dec->cur += 8;
…		…
1047	fp = ecb_bswap64 (fp);	1416	fp = ecb_bswap64 (fp);
1048		1417
1049	return newSVnv (ecb_binary64_to_double (fp));	1418	return newSVnv (ecb_binary64_to_double (fp));
1050	}	1419	}
1051		1420
1052	// 0..19 unassigned	1421	// 0..19 unassigned simple
1053	// 24 reserved + unassigned (reserved values are not encodable)	1422	// 24 reserved + unassigned simple (reserved values are not encodable)
		1423	// 28-30 unassigned misc
		1424	// 31 break code
1054	default:	1425	default:
1055	ERR ("corrupted CBOR data (reserved/unassigned major 7 value)");	1426	ERR ("corrupted CBOR data (reserved/unassigned/unexpected major 7 value)");
1056	}	1427	}
1057		1428
1058	break;	1429	break;
1059	}	1430	}
1060		1431
…		…
1063	}	1434	}
1064		1435
1065	static SV *	1436	static SV *
1066	decode_cbor (SV *string, CBOR *cbor, char **offset_return)	1437	decode_cbor (SV *string, CBOR *cbor, char **offset_return)
1067	{	1438	{
1068	dec_t dec = { };	1439	dec_t dec = { 0 };
1069	SV *sv;	1440	SV *sv;
1070	STRLEN len;	1441	STRLEN len;
1071	char *data = SvPVbyte (string, len);	1442	char *data = SvPVbyte (string, len);
1072		1443
1073	if (len > cbor->max_size && cbor->max_size)	1444	if (len > cbor->max_size && cbor->max_size)
…		…
1087	if (dec.cur != dec.end && !dec.err)	1458	if (dec.cur != dec.end && !dec.err)
1088	dec.err = "garbage after CBOR object";	1459	dec.err = "garbage after CBOR object";
1089		1460
1090	if (dec.err)	1461	if (dec.err)
1091	{	1462	{
		1463	if (dec.shareable)
		1464	{
		1465	// need to break cyclic links, which would all be in shareable
		1466	int i;
		1467	SV **svp;
		1468
		1469	for (i = av_len (dec.shareable) + 1; i--; )
		1470	if ((svp = av_fetch (dec.shareable, i, 0)))
		1471	sv_setsv (*svp, &PL_sv_undef);
		1472	}
		1473
1092	SvREFCNT_dec (sv);	1474	SvREFCNT_dec_NN (sv);
		1475
		1476	if (dec.err_sv)
		1477	sv_2mortal (dec.err_sv);
		1478
1093	croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur);	1479	croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur);
1094	}	1480	}
1095		1481
1096	sv = sv_2mortal (sv);	1482	sv = sv_2mortal (sv);
1097		1483
1098	return sv;	1484	return sv;
1099	}	1485	}
1100		1486
		1487	/////////////////////////////////////////////////////////////////////////////
		1488	// incremental parser
		1489
		1490	#define INCR_DONE(cbor) (AvFILLp (cbor->incr_count) < 0)
		1491
		1492	// returns 0 for notyet, 1 for success or error
		1493	static int
		1494	incr_parse (CBOR *self, SV *cborstr)
		1495	{
		1496	STRLEN cur;
		1497	SvPV (cborstr, cur);
		1498
		1499	while (ecb_expect_true (self->incr_need <= cur))
		1500	{
		1501	// table of integer count bytes
		1502	static I8 incr_len[MINOR_MASK + 1] = {
		1503	0, 0, 0, 0, 0, 0, 0, 0,
		1504	0, 0, 0, 0, 0, 0, 0, 0,
		1505	0, 0, 0, 0, 0, 0, 0, 0,
		1506	1, 2, 4, 8,-1,-1,-1,-2
		1507	};
		1508
		1509	const U8 *p = SvPVX (cborstr) + self->incr_pos;
		1510	U8 m = *p & MINOR_MASK;
		1511	IV count = SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]);
		1512	I8 ilen = incr_len[m];
		1513
		1514	self->incr_need = self->incr_pos + 1;
		1515
		1516	if (ecb_expect_false (ilen < 0))
		1517	{
		1518	if (m != MINOR_INDEF)
		1519	return 1; // error
		1520
		1521	if (*p == (MAJOR_MISC | MINOR_INDEF))
		1522	{
		1523	if (count >= 0)
		1524	return 1; // error
		1525
		1526	count = 1;
		1527	}
		1528	else
		1529	{
		1530	av_push (self->incr_count, newSViv (-1)); //TODO: nest
		1531	count = -1;
		1532	}
		1533	}
		1534	else
		1535	{
		1536	self->incr_need += ilen;
		1537	if (ecb_expect_false (self->incr_need > cur))
		1538	return 0;
		1539
		1540	int major = *p >> MAJOR_SHIFT;
		1541
		1542	switch (major)
		1543	{
		1544	case MAJOR_TAG >> MAJOR_SHIFT:
		1545	++count; // tags merely prefix another value
		1546	break;
		1547
		1548	case MAJOR_BYTES >> MAJOR_SHIFT:
		1549	case MAJOR_TEXT >> MAJOR_SHIFT:
		1550	case MAJOR_ARRAY >> MAJOR_SHIFT:
		1551	case MAJOR_MAP >> MAJOR_SHIFT:
		1552	{
		1553	UV len;
		1554
		1555	if (ecb_expect_false (ilen))
		1556	{
		1557	len = 0;
		1558
		1559	do {
		1560	len = (len << 8) | *++p;
		1561	} while (--ilen);
		1562	}
		1563	else
		1564	len = m;
		1565
		1566	switch (major)
		1567	{
		1568	case MAJOR_BYTES >> MAJOR_SHIFT:
		1569	case MAJOR_TEXT >> MAJOR_SHIFT:
		1570	self->incr_need += len;
		1571	if (ecb_expect_false (self->incr_need > cur))
		1572	return 0;
		1573
		1574	break;
		1575
		1576	case MAJOR_MAP >> MAJOR_SHIFT:
		1577	len <<= 1;
		1578	/* FALLTHROUGH */
		1579	case MAJOR_ARRAY >> MAJOR_SHIFT:
		1580	if (len)
		1581	{
		1582	av_push (self->incr_count, newSViv (len + 1)); //TODO: nest
		1583	count = len + 1;
		1584	}
		1585	break;
		1586	}
		1587	}
		1588	}
		1589	}
		1590
		1591	self->incr_pos = self->incr_need;
		1592
		1593	if (count > 0)
		1594	{
		1595	while (!--count)
		1596	{
		1597	if (!AvFILLp (self->incr_count))
		1598	return 1; // done
		1599
		1600	SvREFCNT_dec_NN (av_pop (self->incr_count));
		1601	count = SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]);
		1602	}
		1603
		1604	SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]) = count;
		1605	}
		1606	}
		1607
		1608	return 0;
		1609	}
		1610
		1611
1101	/////////////////////////////////////////////////////////////////////////////	1612	/////////////////////////////////////////////////////////////////////////////
1102	// XS interface functions	1613	// XS interface functions
1103		1614
1104	MODULE = CBOR::XS PACKAGE = CBOR::XS	1615	MODULE = CBOR::XS PACKAGE = CBOR::XS
1105		1616
…		…
1117		1628
1118	default_filter = newSVpv ("CBOR::XS::default_filter", 0);	1629	default_filter = newSVpv ("CBOR::XS::default_filter", 0);
1119		1630
1120	sv_cbor = newSVpv ("CBOR", 0);	1631	sv_cbor = newSVpv ("CBOR", 0);
1121	SvREADONLY_on (sv_cbor);	1632	SvREADONLY_on (sv_cbor);
		1633
		1634	assert (("STRLEN must be an unsigned type", 0 <= (STRLEN)-1));
1122	}	1635	}
1123		1636
1124	PROTOTYPES: DISABLE	1637	PROTOTYPES: DISABLE
1125		1638
1126	void CLONE (...)	1639	void CLONE (...)
…		…
1145	void shrink (CBOR *self, int enable = 1)	1658	void shrink (CBOR *self, int enable = 1)
1146	ALIAS:	1659	ALIAS:
1147	shrink = F_SHRINK	1660	shrink = F_SHRINK
1148	allow_unknown = F_ALLOW_UNKNOWN	1661	allow_unknown = F_ALLOW_UNKNOWN
1149	allow_sharing = F_ALLOW_SHARING	1662	allow_sharing = F_ALLOW_SHARING
1150	allow_stringref = F_ALLOW_STRINGREF	1663	allow_cycles = F_ALLOW_CYCLES
		1664	forbid_objects = F_FORBID_OBJECTS
		1665	pack_strings = F_PACK_STRINGS
		1666	text_keys = F_TEXT_KEYS
		1667	text_strings = F_TEXT_STRINGS
		1668	validate_utf8 = F_VALIDATE_UTF8
1151	PPCODE:	1669	PPCODE:
1152	{	1670	{
1153	if (enable)	1671	if (enable)
1154	self->flags |= ix;	1672	self->flags |= ix;
1155	else	1673	else
…		…
1161	void get_shrink (CBOR *self)	1679	void get_shrink (CBOR *self)
1162	ALIAS:	1680	ALIAS:
1163	get_shrink = F_SHRINK	1681	get_shrink = F_SHRINK
1164	get_allow_unknown = F_ALLOW_UNKNOWN	1682	get_allow_unknown = F_ALLOW_UNKNOWN
1165	get_allow_sharing = F_ALLOW_SHARING	1683	get_allow_sharing = F_ALLOW_SHARING
1166	get_allow_stringref = F_ALLOW_STRINGREF	1684	get_allow_cycles = F_ALLOW_CYCLES
		1685	get_forbid_objects = F_FORBID_OBJECTS
		1686	get_pack_strings = F_PACK_STRINGS
		1687	get_text_keys = F_TEXT_KEYS
		1688	get_text_strings = F_TEXT_STRINGS
		1689	get_validate_utf8 = F_VALIDATE_UTF8
1167	PPCODE:	1690	PPCODE:
1168	XPUSHs (boolSV (self->flags & ix));	1691	XPUSHs (boolSV (self->flags & ix));
1169		1692
1170	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)	1693	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
1171	PPCODE:	1694	PPCODE:
…		…
1220	EXTEND (SP, 2);	1743	EXTEND (SP, 2);
1221	PUSHs (sv);	1744	PUSHs (sv);
1222	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));	1745	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1223	}	1746	}
1224		1747
		1748	void incr_parse (CBOR *self, SV *cborstr)
		1749	ALIAS:
		1750	incr_parse_multiple = 1
		1751	PPCODE:
		1752	{
		1753	if (SvUTF8 (cborstr))
		1754	sv_utf8_downgrade (cborstr, 0);
		1755
		1756	if (!self->incr_count)
		1757	{
		1758	self->incr_count = newAV ();
		1759	self->incr_pos = 0;
		1760	self->incr_need = 1;
		1761
		1762	av_push (self->incr_count, newSViv (1));
		1763	}
		1764
		1765	do
		1766	{
		1767	if (!incr_parse (self, cborstr))
		1768	{
		1769	if (self->incr_need > self->max_size && self->max_size)
		1770	croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",
		1771	(unsigned long)self->incr_need, (unsigned long)self->max_size);
		1772
		1773	break;
		1774	}
		1775
		1776	SV *sv;
		1777	char *offset;
		1778
		1779	PUTBACK; sv = decode_cbor (cborstr, self, &offset); SPAGAIN;
		1780	XPUSHs (sv);
		1781
		1782	sv_chop (cborstr, offset);
		1783
		1784	av_clear (self->incr_count);
		1785	av_push (self->incr_count, newSViv (1));
		1786
		1787	self->incr_pos = 0;
		1788	self->incr_need = self->incr_pos + 1;
		1789	}
		1790	while (ix);
		1791	}
		1792
		1793	void incr_reset (CBOR *self)
		1794	CODE:
		1795	{
		1796	SvREFCNT_dec (self->incr_count);
		1797	self->incr_count = 0;
		1798	}
		1799
1225	void DESTROY (CBOR *self)	1800	void DESTROY (CBOR *self)
1226	PPCODE:	1801	PPCODE:
1227	cbor_free (self);	1802	cbor_free (self);
1228		1803
1229	PROTOTYPES: ENABLE	1804	PROTOTYPES: ENABLE
1230		1805
1231	void encode_cbor (SV *scalar)	1806	void encode_cbor (SV *scalar)
		1807	ALIAS:
		1808	encode_cbor = 0
		1809	encode_cbor_sharing = F_ALLOW_SHARING
1232	PPCODE:	1810	PPCODE:
1233	{	1811	{
1234	CBOR cbor;	1812	CBOR cbor;
1235	cbor_init (&cbor);	1813	cbor_init (&cbor);
		1814	cbor.flags |= ix;
1236	PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN;	1815	PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN;
1237	XPUSHs (scalar);	1816	XPUSHs (scalar);
1238	}	1817	}
1239		1818
1240	void decode_cbor (SV *cborstr)	1819	void decode_cbor (SV *cborstr)
…		…
1244	cbor_init (&cbor);	1823	cbor_init (&cbor);
1245	PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN;	1824	PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN;
1246	XPUSHs (cborstr);	1825	XPUSHs (cborstr);
1247	}	1826	}
1248		1827
		1828	#ifdef __AFL_COMPILER
		1829
		1830	void
		1831	afl_init ()
		1832	CODE:
		1833	__AFL_INIT ();
		1834
		1835	int
		1836	afl_loop (unsigned int count = 10000)
		1837	CODE:
		1838	RETVAL = __AFL_LOOP (count);
		1839	OUTPUT:
		1840	RETVAL
		1841
		1842	#endif
		1843

Diff Legend

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