ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/CBOR-XS/XS.xs

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.13 by root, Mon Oct 28 22:50:50 2013 UTC vs.
Revision 1.57 by root, Fri Nov 25 12:16:12 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	SvREFCNT_dec (k);
604	}	845	}
605	}	846	}
606	else	847	else
607	{	848	{
608	int len = decode_uint (dec);	849	UV pairs = decode_uint (dec);
609		850
		851	WANT (pairs); // complexity check - need at least one byte per value, do not allow supersize hashes
		852
610	while (len--)	853	while (pairs--)
611	{	854	decode_he (dec, hv);
612	SV *k = decode_sv (dec);
613	SV *v = decode_sv (dec);
614
615	hv_store_ent (hv, k, v, 0);
616	SvREFCNT_dec (k);
617	}
618	}	855	}
619		856
620	DEC_DEC_DEPTH;	857	DEC_DEC_DEPTH;
621	return newRV_noinc ((SV *)hv);	858	return newRV_noinc ((SV *)hv);
622		859
…		…
629	static SV *	866	static SV *
630	decode_str (dec_t *dec, int utf8)	867	decode_str (dec_t *dec, int utf8)
631	{	868	{
632	SV *sv = 0;	869	SV *sv = 0;
633		870
634	if ((*dec->cur & 31) == 31)	871	if ((*dec->cur & MINOR_MASK) == MINOR_INDEF)
635	{	872	{
		873	// indefinite length strings
636	++dec->cur;	874	++dec->cur;
637		875
		876	U8 major = *dec->cur & MAJOR_MISC;
		877
638	sv = newSVpvn ("", 0);	878	sv = newSVpvn ("", 0);
639		879
640	// not very fast, and certainly not robust against illegal input
641	for (;;)	880	for (;;)
642	{	881	{
643	WANT (1);	882	WANT (1);
644		883
645	if (*dec->cur == (0xe0 | 31))	884	if ((*dec->cur - major) > LENGTH_EXT8)
		885	if (*dec->cur == (MAJOR_MISC | MINOR_INDEF))
646	{	886	{
647	++dec->cur;	887	++dec->cur;
648	break;	888	break;
649	}	889	}
		890	else
		891	ERR ("corrupted CBOR data (invalid chunks in indefinite length string)");
650		892
651	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;
652	}	898	}
653	}	899	}
654	else	900	else
655	{	901	{
656	STRLEN len = decode_uint (dec);	902	STRLEN len = decode_uint (dec);
657		903
658	WANT (len);	904	WANT (len);
659	sv = newSVpvn (dec->cur, len);	905	sv = newSVpvn (dec->cur, len);
660	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));
661	}	911	}
662		912
663	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
664	SvUTF8_on (sv);	919	SvUTF8_on (sv);
		920	}
665		921
666	return sv;	922	return sv;
667		923
668	fail:	924	fail:
669	SvREFCNT_dec (sv);	925	SvREFCNT_dec (sv);
…		…
671	}	927	}
672		928
673	static SV *	929	static SV *
674	decode_tagged (dec_t *dec)	930	decode_tagged (dec_t *dec)
675	{	931	{
		932	SV *sv = 0;
676	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:
677	SV *sv = decode_sv (dec);	940	sv = decode_sv (dec);
		941	break;
678		942
679	if (tag == CBOR_TAG_MAGIC)	943	case CBOR_TAG_INDIRECTION:
680	return sv;	944	sv = newRV_noinc (decode_sv (dec));
681	else if (tag == CBOR_TAG_PERL_OBJECT)	945	break;
682	{	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
683	if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)	1021	if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
684	ERR ("corrupted CBOR data (non-array perl object)");	1022	ERR ("corrupted CBOR data (non-array perl object)");
685		1023
686	AV *av = (AV *)SvRV (sv);	1024	AV *av = (AV *)SvRV (sv);
687	int len = av_len (av) + 1;	1025	int len = av_len (av) + 1;
688	HV *stash = gv_stashsv (*av_fetch (av, 0, 1), 0);	1026	HV *stash = gv_stashsv (*av_fetch (av, 0, 1), 0);
689		1027
690	if (!stash)	1028	if (!stash)
691	ERR ("cannot decode perl-object (package does not exist)");	1029	ERR ("cannot decode perl-object (package does not exist)");
692		1030
693	GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);	1031	GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
694		1032
695	if (!method)	1033	if (!method)
696	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)");
697		1035
698	dSP;	1036	dSP;
699		1037
700	ENTER; SAVETMPS; PUSHMARK (SP);	1038	ENTER; SAVETMPS;
		1039	PUSHMARK (SP);
701	EXTEND (SP, len + 1);	1040	EXTEND (SP, len + 1);
702	// 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
703	PUSHs (*av_fetch (av, 0, 1));	1042	PUSHs (*av_fetch (av, 0, 1));
704	PUSHs (sv_cbor);	1043	PUSHs (sv_cbor);
705		1044
706	int i;	1045	int i;
707		1046
708	for (i = 1; i < len; ++i)	1047	for (i = 1; i < len; ++i)
709	PUSHs (*av_fetch (av, i, 1));	1048	PUSHs (*av_fetch (av, i, 1));
710		1049
711	PUTBACK;	1050	PUTBACK;
712	call_sv ((SV *)GvCV (method), G_SCALAR);	1051	call_sv ((SV *)GvCV (method), G_SCALAR | G_EVAL);
713	SPAGAIN;	1052	SPAGAIN;
714		1053
		1054	if (SvTRUE (ERRSV))
		1055	{
		1056	FREETMPS; LEAVE;
		1057	ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
		1058	}
		1059
715	SvREFCNT_dec (sv);	1060	SvREFCNT_dec (sv);
716	sv = SvREFCNT_inc (POPs);	1061	sv = SvREFCNT_inc (POPs);
717		1062
718	PUTBACK;	1063	PUTBACK;
719		1064
720	FREETMPS; LEAVE;	1065	FREETMPS; LEAVE;
		1066	}
		1067	break;
721		1068
722	return sv;	1069	default:
723	}	1070	{
724	else	1071	sv = decode_sv (dec);
725	{	1072
		1073	dSP;
		1074	ENTER; SAVETMPS;
		1075	SAVESTACK_POS ();
		1076	PUSHMARK (SP);
		1077	EXTEND (SP, 2);
		1078	PUSHs (newSVuv (tag));
		1079	PUSHs (sv);
		1080
		1081	PUTBACK;
		1082	int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL);
		1083	SPAGAIN;
		1084
		1085	if (SvTRUE (ERRSV))
		1086	{
		1087	FREETMPS; LEAVE;
		1088	ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
		1089	}
		1090
		1091	if (count)
		1092	{
		1093	SvREFCNT_dec (sv);
		1094	sv = SvREFCNT_inc (POPs);
		1095	}
		1096	else
		1097	{
726	AV *av = newAV ();	1098	AV *av = newAV ();
727	av_push (av, newSVuv (tag));	1099	av_push (av, newSVuv (tag));
728	av_push (av, sv);	1100	av_push (av, sv);
729		1101
730	HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash	1102	HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
731	? cbor_tagged_stash	1103	? cbor_tagged_stash
732	: gv_stashpv ("CBOR::XS::Tagged" , 1);	1104	: gv_stashpv ("CBOR::XS::Tagged" , 1);
733
734	return sv_bless (newRV_noinc ((SV *)av), tagged_stash);	1105	sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash);
		1106	}
		1107
		1108	PUTBACK;
		1109
		1110	FREETMPS; LEAVE;
		1111	}
		1112	break;
735	}	1113	}
		1114
		1115	return sv;
736		1116
737	fail:	1117	fail:
738	SvREFCNT_dec (sv);	1118	SvREFCNT_dec (sv);
739	return &PL_sv_undef;	1119	return &PL_sv_undef;
740	}	1120	}
…		…
742	static SV *	1122	static SV *
743	decode_sv (dec_t *dec)	1123	decode_sv (dec_t *dec)
744	{	1124	{
745	WANT (1);	1125	WANT (1);
746		1126
747	switch (*dec->cur >> 5)	1127	switch (*dec->cur >> MAJOR_SHIFT)
748	{	1128	{
749	case 0: // unsigned int	1129	case MAJOR_POS_INT >> MAJOR_SHIFT: return newSVuv (decode_uint (dec));
750	return newSVuv (decode_uint (dec));	1130	case MAJOR_NEG_INT >> MAJOR_SHIFT: return newSViv (-1 - (IV)decode_uint (dec));
751	case 1: // negative int	1131	case MAJOR_BYTES >> MAJOR_SHIFT: return decode_str (dec, 0);
752	return newSViv (-1 - (IV)decode_uint (dec));	1132	case MAJOR_TEXT >> MAJOR_SHIFT: return decode_str (dec, 1);
753	case 2: // octet string	1133	case MAJOR_ARRAY >> MAJOR_SHIFT: return decode_av (dec);
754	return decode_str (dec, 0);	1134	case MAJOR_MAP >> MAJOR_SHIFT: return decode_hv (dec);
755	case 3: // utf-8 string	1135	case MAJOR_TAG >> MAJOR_SHIFT: return decode_tagged (dec);
756	return decode_str (dec, 1);	1136
757	case 4: // array	1137	case MAJOR_MISC >> MAJOR_SHIFT:
758	return decode_av (dec);
759	case 5: // map
760	return decode_hv (dec);
761	case 6: // tag
762	return decode_tagged (dec);
763	case 7: // misc
764	switch (*dec->cur++ & 31)	1138	switch (*dec->cur++ & MINOR_MASK)
765	{	1139	{
766	case 20:	1140	case SIMPLE_FALSE:
767	#if CBOR_SLOW	1141	#if CBOR_SLOW
768	types_false = get_bool ("Types::Serialiser::false");	1142	types_false = get_bool ("Types::Serialiser::false");
769	#endif	1143	#endif
770	return newSVsv (types_false);	1144	return newSVsv (types_false);
771	case 21:	1145	case SIMPLE_TRUE:
772	#if CBOR_SLOW	1146	#if CBOR_SLOW
773	types_true = get_bool ("Types::Serialiser::true");	1147	types_true = get_bool ("Types::Serialiser::true");
774	#endif	1148	#endif
775	return newSVsv (types_true);	1149	return newSVsv (types_true);
776	case 22:	1150	case SIMPLE_NULL:
777	return newSVsv (&PL_sv_undef);	1151	return newSVsv (&PL_sv_undef);
778	case 23:	1152	case SIMPLE_UNDEF:
779	#if CBOR_SLOW	1153	#if CBOR_SLOW
780	types_error = get_bool ("Types::Serialiser::error");	1154	types_error = get_bool ("Types::Serialiser::error");
781	#endif	1155	#endif
782	return newSVsv (types_error);	1156	return newSVsv (types_error);
783		1157
784	case 25:	1158	case MISC_FLOAT16:
785	{	1159	{
786	WANT (2);	1160	WANT (2);
787		1161
788	uint16_t fp = (dec->cur[0] << 8) | dec->cur[1];	1162	uint16_t fp = (dec->cur[0] << 8) | dec->cur[1];
789	dec->cur += 2;	1163	dec->cur += 2;
790		1164
791	return newSVnv (ecb_binary16_to_float (fp));	1165	return newSVnv (ecb_binary16_to_float (fp));
792	}	1166	}
793		1167
794	case 26:	1168	case MISC_FLOAT32:
795	{	1169	{
796	uint32_t fp;	1170	uint32_t fp;
797	WANT (4);	1171	WANT (4);
798	memcpy (&fp, dec->cur, 4);	1172	memcpy (&fp, dec->cur, 4);
799	dec->cur += 4;	1173	dec->cur += 4;
…		…
802	fp = ecb_bswap32 (fp);	1176	fp = ecb_bswap32 (fp);
803		1177
804	return newSVnv (ecb_binary32_to_float (fp));	1178	return newSVnv (ecb_binary32_to_float (fp));
805	}	1179	}
806		1180
807	case 27:	1181	case MISC_FLOAT64:
808	{	1182	{
809	uint64_t fp;	1183	uint64_t fp;
810	WANT (8);	1184	WANT (8);
811	memcpy (&fp, dec->cur, 8);	1185	memcpy (&fp, dec->cur, 8);
812	dec->cur += 8;	1186	dec->cur += 8;
…		…
815	fp = ecb_bswap64 (fp);	1189	fp = ecb_bswap64 (fp);
816		1190
817	return newSVnv (ecb_binary64_to_double (fp));	1191	return newSVnv (ecb_binary64_to_double (fp));
818	}	1192	}
819		1193
820	// 0..19 unassigned	1194	// 0..19 unassigned simple
821	// 24 reserved + unassigned (reserved values are not encodable)	1195	// 24 reserved + unassigned simple (reserved values are not encodable)
		1196	// 28-30 unassigned misc
		1197	// 31 break code
822	default:	1198	default:
823	ERR ("corrupted CBOR data (reserved/unassigned major 7 value)");	1199	ERR ("corrupted CBOR data (reserved/unassigned/unexpected major 7 value)");
824	}	1200	}
825		1201
826	break;	1202	break;
827	}	1203	}
828		1204
…		…
831	}	1207	}
832		1208
833	static SV *	1209	static SV *
834	decode_cbor (SV *string, CBOR *cbor, char **offset_return)	1210	decode_cbor (SV *string, CBOR *cbor, char **offset_return)
835	{	1211	{
836	dec_t dec;	1212	dec_t dec = { 0 };
837	SV *sv;	1213	SV *sv;
		1214	STRLEN len;
		1215	char *data = SvPVbyte (string, len);
838		1216
839	/* work around bugs in 5.10 where manipulating magic values
840	* makes perl ignore the magic in subsequent accesses.
841	* also make a copy of non-PV values, to get them into a clean
842	* state (SvPV should do that, but it's buggy, see below).
843	*/
844	/*SvGETMAGIC (string);*/
845	if (SvMAGICAL (string) || !SvPOK (string))
846	string = sv_2mortal (newSVsv (string));
847
848	SvUPGRADE (string, SVt_PV);
849
850	/* work around a bug in perl 5.10, which causes SvCUR to fail an
851	* assertion with -DDEBUGGING, although SvCUR is documented to
852	* return the xpv_cur field which certainly exists after upgrading.
853	* according to nicholas clark, calling SvPOK fixes this.
854	* But it doesn't fix it, so try another workaround, call SvPV_nolen
855	* and hope for the best.
856	* Damnit, SvPV_nolen still trips over yet another assertion. This
857	* assertion business is seriously broken, try yet another workaround
858	* for the broken -DDEBUGGING.
859	*/
860	{
861	#ifdef DEBUGGING
862	STRLEN offset = SvOK (string) ? sv_len (string) : 0;
863	#else
864	STRLEN offset = SvCUR (string);
865	#endif
866
867	if (offset > cbor->max_size && cbor->max_size)	1217	if (len > cbor->max_size && cbor->max_size)
868	croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",	1218	croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",
869	(unsigned long)SvCUR (string), (unsigned long)cbor->max_size);	1219	(unsigned long)len, (unsigned long)cbor->max_size);
870	}
871
872	sv_utf8_downgrade (string, 0);
873		1220
874	dec.cbor = *cbor;	1221	dec.cbor = *cbor;
875	dec.cur = (U8 *)SvPVX (string);	1222	dec.cur = (U8 *)data;
876	dec.end = (U8 *)SvEND (string);	1223	dec.end = (U8 *)data + len;
877	dec.err = 0;
878	dec.depth = 0;
879		1224
880	sv = decode_sv (&dec);	1225	sv = decode_sv (&dec);
881		1226
882	if (offset_return)	1227	if (offset_return)
883	*offset_return = dec.cur;	1228	*offset_return = dec.cur;
…		…
886	if (dec.cur != dec.end && !dec.err)	1231	if (dec.cur != dec.end && !dec.err)
887	dec.err = "garbage after CBOR object";	1232	dec.err = "garbage after CBOR object";
888		1233
889	if (dec.err)	1234	if (dec.err)
890	{	1235	{
		1236	if (dec.shareable)
		1237	{
		1238	// need to break cyclic links, which whould all be in shareable
		1239	int i;
		1240	SV **svp;
		1241
		1242	for (i = av_len (dec.shareable) + 1; i--; )
		1243	if ((svp = av_fetch (dec.shareable, i, 0)))
		1244	sv_setsv (*svp, &PL_sv_undef);
		1245	}
		1246
891	SvREFCNT_dec (sv);	1247	SvREFCNT_dec (sv);
892	croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)SvPVX (string), (int)(uint8_t)*dec.cur);	1248	croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur);
893	}	1249	}
894		1250
895	sv = sv_2mortal (sv);	1251	sv = sv_2mortal (sv);
896		1252
897	return sv;	1253	return sv;
898	}	1254	}
899		1255
		1256	/////////////////////////////////////////////////////////////////////////////
		1257	// incremental parser
		1258
		1259	#define INCR_DONE(cbor) (AvFILLp (cbor->incr_count) < 0)
		1260
		1261	// returns 0 for notyet, 1 for success or error
		1262	static int
		1263	incr_parse (CBOR *self, SV *cborstr)
		1264	{
		1265	STRLEN cur;
		1266	SvPV (cborstr, cur);
		1267
		1268	while (ecb_expect_true (self->incr_need <= cur))
		1269	{
		1270	// table of integer count bytes
		1271	static I8 incr_len[MINOR_MASK + 1] = {
		1272	0, 0, 0, 0, 0, 0, 0, 0,
		1273	0, 0, 0, 0, 0, 0, 0, 0,
		1274	0, 0, 0, 0, 0, 0, 0, 0,
		1275	1, 2, 4, 8,-1,-1,-1,-2
		1276	};
		1277
		1278	const U8 *p = SvPVX (cborstr) + self->incr_pos;
		1279	U8 m = *p & MINOR_MASK;
		1280	IV count = SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]);
		1281	I8 ilen = incr_len[m];
		1282
		1283	self->incr_need = self->incr_pos + 1;
		1284
		1285	if (ecb_expect_false (ilen < 0))
		1286	{
		1287	if (m != MINOR_INDEF)
		1288	return 1; // error
		1289
		1290	if (*p == (MAJOR_MISC | MINOR_INDEF))
		1291	{
		1292	if (count >= 0)
		1293	return 1; // error
		1294
		1295	count = 1;
		1296	}
		1297	else
		1298	{
		1299	av_push (self->incr_count, newSViv (-1)); //TODO: nest
		1300	count = -1;
		1301	}
		1302	}
		1303	else
		1304	{
		1305	self->incr_need += ilen;
		1306	if (ecb_expect_false (self->incr_need > cur))
		1307	return 0;
		1308
		1309	int major = *p >> MAJOR_SHIFT;
		1310
		1311	switch (major)
		1312	{
		1313	case MAJOR_TAG >> MAJOR_SHIFT:
		1314	++count; // tags merely prefix another value
		1315	break;
		1316
		1317	case MAJOR_BYTES >> MAJOR_SHIFT:
		1318	case MAJOR_TEXT >> MAJOR_SHIFT:
		1319	case MAJOR_ARRAY >> MAJOR_SHIFT:
		1320	case MAJOR_MAP >> MAJOR_SHIFT:
		1321	{
		1322	UV len;
		1323
		1324	if (ecb_expect_false (ilen))
		1325	{
		1326	len = 0;
		1327
		1328	do {
		1329	len = (len << 8) | *++p;
		1330	} while (--ilen);
		1331	}
		1332	else
		1333	len = m;
		1334
		1335	switch (major)
		1336	{
		1337	case MAJOR_BYTES >> MAJOR_SHIFT:
		1338	case MAJOR_TEXT >> MAJOR_SHIFT:
		1339	self->incr_need += len;
		1340	if (ecb_expect_false (self->incr_need > cur))
		1341	return 0;
		1342
		1343	break;
		1344
		1345	case MAJOR_MAP >> MAJOR_SHIFT:
		1346	len <<= 1;
		1347	case MAJOR_ARRAY >> MAJOR_SHIFT:
		1348	if (len)
		1349	{
		1350	av_push (self->incr_count, newSViv (len + 1)); //TODO: nest
		1351	count = len + 1;
		1352	}
		1353	break;
		1354	}
		1355	}
		1356	}
		1357	}
		1358
		1359	self->incr_pos = self->incr_need;
		1360
		1361	if (count > 0)
		1362	{
		1363	while (!--count)
		1364	{
		1365	if (!AvFILLp (self->incr_count))
		1366	return 1; // done
		1367
		1368	SvREFCNT_dec_NN (av_pop (self->incr_count));
		1369	count = SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]);
		1370	}
		1371
		1372	SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]) = count;
		1373	}
		1374	}
		1375
		1376	return 0;
		1377	}
		1378
		1379
900	/////////////////////////////////////////////////////////////////////////////	1380	/////////////////////////////////////////////////////////////////////////////
901	// XS interface functions	1381	// XS interface functions
902		1382
903	MODULE = CBOR::XS PACKAGE = CBOR::XS	1383	MODULE = CBOR::XS PACKAGE = CBOR::XS
904		1384
…		…
912		1392
913	types_true = get_bool ("Types::Serialiser::true" );	1393	types_true = get_bool ("Types::Serialiser::true" );
914	types_false = get_bool ("Types::Serialiser::false");	1394	types_false = get_bool ("Types::Serialiser::false");
915	types_error = get_bool ("Types::Serialiser::error");	1395	types_error = get_bool ("Types::Serialiser::error");
916		1396
		1397	default_filter = newSVpv ("CBOR::XS::default_filter", 0);
		1398
917	sv_cbor = newSVpv ("CBOR", 0);	1399	sv_cbor = newSVpv ("CBOR", 0);
918	SvREADONLY_on (sv_cbor);	1400	SvREADONLY_on (sv_cbor);
		1401
		1402	assert (("STRLEN must be an unsigned type", 0 <= (STRLEN)-1));
919	}	1403	}
920		1404
921	PROTOTYPES: DISABLE	1405	PROTOTYPES: DISABLE
922		1406
923	void CLONE (...)	1407	void CLONE (...)
…		…
941		1425
942	void shrink (CBOR *self, int enable = 1)	1426	void shrink (CBOR *self, int enable = 1)
943	ALIAS:	1427	ALIAS:
944	shrink = F_SHRINK	1428	shrink = F_SHRINK
945	allow_unknown = F_ALLOW_UNKNOWN	1429	allow_unknown = F_ALLOW_UNKNOWN
		1430	allow_sharing = F_ALLOW_SHARING
		1431	allow_cycles = F_ALLOW_CYCLES
		1432	pack_strings = F_PACK_STRINGS
		1433	text_keys = F_TEXT_KEYS
		1434	text_strings = F_TEXT_STRINGS
		1435	validate_utf8 = F_VALIDATE_UTF8
946	PPCODE:	1436	PPCODE:
947	{	1437	{
948	if (enable)	1438	if (enable)
949	self->flags |= ix;	1439	self->flags |= ix;
950	else	1440	else
…		…
955		1445
956	void get_shrink (CBOR *self)	1446	void get_shrink (CBOR *self)
957	ALIAS:	1447	ALIAS:
958	get_shrink = F_SHRINK	1448	get_shrink = F_SHRINK
959	get_allow_unknown = F_ALLOW_UNKNOWN	1449	get_allow_unknown = F_ALLOW_UNKNOWN
		1450	get_allow_sharing = F_ALLOW_SHARING
		1451	get_allow_cycles = F_ALLOW_CYCLES
		1452	get_pack_strings = F_PACK_STRINGS
		1453	get_text_keys = F_TEXT_KEYS
		1454	get_text_strings = F_TEXT_STRINGS
		1455	get_validate_utf8 = F_VALIDATE_UTF8
960	PPCODE:	1456	PPCODE:
961	XPUSHs (boolSV (self->flags & ix));	1457	XPUSHs (boolSV (self->flags & ix));
962		1458
963	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)	1459	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
964	PPCODE:	1460	PPCODE:
…		…
980	CODE:	1476	CODE:
981	RETVAL = self->max_size;	1477	RETVAL = self->max_size;
982	OUTPUT:	1478	OUTPUT:
983	RETVAL	1479	RETVAL
984		1480
985	#if 0 //TODO	1481	void filter (CBOR *self, SV *filter = 0)
986
987	void filter_cbor_object (CBOR *self, SV *cb = &PL_sv_undef)
988	PPCODE:	1482	PPCODE:
989	{
990	SvREFCNT_dec (self->cb_object);	1483	SvREFCNT_dec (self->filter);
991	self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;	1484	self->filter = filter ? newSVsv (filter) : filter;
992
993	XPUSHs (ST (0));	1485	XPUSHs (ST (0));
994	}
995		1486
996	void filter_cbor_single_key_object (CBOR *self, SV *key, SV *cb = &PL_sv_undef)	1487	SV *get_filter (CBOR *self)
997	PPCODE:	1488	CODE:
998	{	1489	RETVAL = self->filter ? self->filter : NEWSV (0, 0);
999	if (!self->cb_sk_object)	1490	OUTPUT:
1000	self->cb_sk_object = newHV ();	1491	RETVAL
1001
1002	if (SvOK (cb))
1003	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1004	else
1005	{
1006	hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
1007
1008	if (!HvKEYS (self->cb_sk_object))
1009	{
1010	SvREFCNT_dec (self->cb_sk_object);
1011	self->cb_sk_object = 0;
1012	}
1013	}
1014
1015	XPUSHs (ST (0));
1016	}
1017
1018	#endif
1019		1492
1020	void encode (CBOR *self, SV *scalar)	1493	void encode (CBOR *self, SV *scalar)
1021	PPCODE:	1494	PPCODE:
1022	PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;	1495	PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;
1023	XPUSHs (scalar);	1496	XPUSHs (scalar);
…		…
1036	EXTEND (SP, 2);	1509	EXTEND (SP, 2);
1037	PUSHs (sv);	1510	PUSHs (sv);
1038	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));	1511	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1039	}	1512	}
1040		1513
1041	#if 0	1514	void incr_parse (CBOR *self, SV *cborstr)
		1515	ALIAS:
		1516	incr_parse_multiple = 1
		1517	PPCODE:
		1518	{
		1519	if (SvUTF8 (cborstr))
		1520	sv_utf8_downgrade (cborstr, 0);
		1521
		1522	if (!self->incr_count)
		1523	{
		1524	self->incr_count = newAV ();
		1525	self->incr_pos = 0;
		1526	self->incr_need = 1;
		1527
		1528	av_push (self->incr_count, newSViv (1));
		1529	}
		1530
		1531	do
		1532	{
		1533	if (!incr_parse (self, cborstr))
		1534	{
		1535	if (self->incr_need > self->max_size && self->max_size)
		1536	croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",
		1537	(unsigned long)self->incr_need, (unsigned long)self->max_size);
		1538
		1539	break;
		1540	}
		1541
		1542	SV *sv;
		1543	char *offset;
		1544
		1545	PUTBACK; sv = decode_cbor (cborstr, self, &offset); SPAGAIN;
		1546	XPUSHs (sv);
		1547
		1548	sv_chop (cborstr, offset);
		1549
		1550	av_clear (self->incr_count);
		1551	av_push (self->incr_count, newSViv (1));
		1552
		1553	self->incr_pos = 0;
		1554	self->incr_need = self->incr_pos + 1;
		1555	}
		1556	while (ix);
		1557	}
		1558
		1559	void incr_reset (CBOR *self)
		1560	CODE:
		1561	{
		1562	SvREFCNT_dec (self->incr_count);
		1563	self->incr_count = 0;
		1564	}
1042		1565
1043	void DESTROY (CBOR *self)	1566	void DESTROY (CBOR *self)
1044	CODE:	1567	PPCODE:
1045	SvREFCNT_dec (self->cb_sk_object);	1568	cbor_free (self);
1046	SvREFCNT_dec (self->cb_object);
1047
1048	#endif
1049		1569
1050	PROTOTYPES: ENABLE	1570	PROTOTYPES: ENABLE
1051		1571
1052	void encode_cbor (SV *scalar)	1572	void encode_cbor (SV *scalar)
		1573	ALIAS:
		1574	encode_cbor = 0
		1575	encode_cbor_sharing = F_ALLOW_SHARING
1053	PPCODE:	1576	PPCODE:
1054	{	1577	{
1055	CBOR cbor;	1578	CBOR cbor;
1056	cbor_init (&cbor);	1579	cbor_init (&cbor);
		1580	cbor.flags |= ix;
1057	PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN;	1581	PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN;
1058	XPUSHs (scalar);	1582	XPUSHs (scalar);
1059	}	1583	}
1060		1584
1061	void decode_cbor (SV *cborstr)	1585	void decode_cbor (SV *cborstr)

Diff Legend

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