ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/CBOR-XS/XS.xs

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.11 by root, Sun Oct 27 22:35:15 2013 UTC vs.
Revision 1.58 by root, Fri Nov 25 13:27:29 2016 UTC

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

Diff Legend

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