[ViewVC] Diff of: cvs/CBOR-XS/XS.xs

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.26 by root, Fri Nov 22 09:40:13 2013 UTC vs.
Revision 1.59 by root, Fri Nov 25 23:37:27 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"
13		14
14	// compatibility with perl <5.18	15	// compatibility with perl <5.18
15	#ifndef HvNAMELEN_get	16	#ifndef HvNAMELEN_get
16	# define HvNAMELEN_get(hv) strlen (HvNAME (hv))	17	# define HvNAMELEN_get(hv) strlen (HvNAME (hv))
…		…
19	# define HvNAMELEN(hv) HvNAMELEN_get (hv)	20	# define HvNAMELEN(hv) HvNAMELEN_get (hv)
20	#endif	21	#endif
21	#ifndef HvNAMEUTF8	22	#ifndef HvNAMEUTF8
22	# define HvNAMEUTF8(hv) 0	23	# define HvNAMEUTF8(hv) 0
23	#endif	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	};
24		65
25	// known tags	66	// known tags
26	enum cbor_tag	67	enum cbor_tag
27	{	68	{
28	// inofficial extensions (pending iana registration)	69	// extensions
		70	CBOR_TAG_STRINGREF = 25, // http://cbor.schmorp.de/stringref
29	CBOR_TAG_PERL_OBJECT = 24, // http://cbor.schmorp.de/perl-object	71	CBOR_TAG_PERL_OBJECT = 26, // http://cbor.schmorp.de/perl-object
30	CBOR_TAG_GENERIC_OBJECT = 25, // http://cbor.schmorp.de/generic-object	72	CBOR_TAG_GENERIC_OBJECT = 27, // http://cbor.schmorp.de/generic-object
31	CBOR_TAG_VALUE_SHAREABLE = 26, // http://cbor.schmorp.de/value-sharing	73	CBOR_TAG_VALUE_SHAREABLE = 28, // http://cbor.schmorp.de/value-sharing
32	CBOR_TAG_VALUE_SHAREDREF = 27, // http://cbor.schmorp.de/value-sharing	74	CBOR_TAG_VALUE_SHAREDREF = 29, // http://cbor.schmorp.de/value-sharing
33	CBOR_TAG_STRINGREF_NAMESPACE = 65537, // http://cbor.schmorp.de/stringref	75	CBOR_TAG_STRINGREF_NAMESPACE = 256, // http://cbor.schmorp.de/stringref
34	CBOR_TAG_STRINGREF = 28, // http://cbor.schmorp.de/stringref
35	CBOR_TAG_INDIRECTION = 22098, // http://cbor.schmorp.de/indirection	76	CBOR_TAG_INDIRECTION = 22098, // http://cbor.schmorp.de/indirection
36		77
37	// rfc7049	78	// rfc7049
38	CBOR_TAG_DATETIME = 0, // rfc4287, utf-8	79	CBOR_TAG_DATETIME = 0, // rfc4287, utf-8
39	CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any	80	CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any
40	CBOR_TAG_POS_BIGNUM = 2, // byte string	81	CBOR_TAG_POS_BIGNUM = 2, // byte string
41	CBOR_TAG_NEG_BIGNUM = 3, // byte string	82	CBOR_TAG_NEG_BIGNUM = 3, // byte string
42	CBOR_TAG_DECIMAL = 4, // decimal fraction, array	83	CBOR_TAG_DECIMAL = 4, // decimal fraction, array
43	CBOR_TAG_BIGFLOAT = 5, // array	84	CBOR_TAG_BIGFLOAT = 5, // array
44		85
45	CBOR_TAG_CONV_B64U = 21, // base64url, any	86	CBOR_TAG_CONV_B64U = 21, // base64url, any
46	CBOR_TAG_CONV_B64 = 22, // base64, any	87	CBOR_TAG_CONV_B64 = 22, // base64, any
47	CBOR_TAG_CONV_HEX = 23, // base16, any	88	CBOR_TAG_CONV_HEX = 23, // base16, any
48	CBOR_TAG_CBOR = 24, // embedded cbor, byte string	89	CBOR_TAG_CBOR = 24, // embedded cbor, byte string
49		90
50	CBOR_TAG_URI = 32, // URI rfc3986, utf-8	91	CBOR_TAG_URI = 32, // URI rfc3986, utf-8
51	CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8	92	CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8
52	CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8	93	CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8
53	CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8	94	CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8
54	CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8	95	CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
55		96
56	CBOR_TAG_MAGIC = 55799 // self-describe cbor	97	CBOR_TAG_MAGIC = 55799, // self-describe cbor
57	};	98	};
58		99
59	#define F_SHRINK 0x00000001UL	100	#define F_SHRINK 0x00000001UL
60	#define F_ALLOW_UNKNOWN 0x00000002UL	101	#define F_ALLOW_UNKNOWN 0x00000002UL
61	#define F_ALLOW_SHARING 0x00000004UL //TODO	102	#define F_ALLOW_SHARING 0x00000004UL
62	#define F_ALLOW_STRINGREF 0x00000008UL //TODO	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
63		108
64	#define INIT_SIZE 32 // initial scalar size to be allocated	109	#define INIT_SIZE 32 // initial scalar size to be allocated
65		110
66	#define SB do {	111	#define SB do {
67	#define SE } while (0)	112	#define SE } while (0)
…		…
79	# define CBOR_SLOW 0	124	# define CBOR_SLOW 0
80	# define CBOR_STASH cbor_stash	125	# define CBOR_STASH cbor_stash
81	#endif	126	#endif
82		127
83	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::
84	static SV types_true, types_false, types_error, sv_cbor;	129	static SV types_true, types_false, types_error, sv_cbor, *default_filter;
85		130
86	typedef struct {	131	typedef struct {
87	U32 flags;	132	U32 flags;
88	U32 max_depth;	133	U32 max_depth;
89	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.
90	} CBOR;	141	} CBOR;
91		142
92	ecb_inline void	143	ecb_inline void
93	cbor_init (CBOR *cbor)	144	cbor_init (CBOR *cbor)
94	{	145	{
95	Zero (cbor, 1, CBOR);	146	Zero (cbor, 1, CBOR);
96	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);
97	}	155	}
98		156
99	/////////////////////////////////////////////////////////////////////////////	157	/////////////////////////////////////////////////////////////////////////////
100	// utility functions	158	// utility functions
101		159
…		…
131	{	189	{
132	return idx > 23	190	return idx > 23
133	? idx > 0xffU	191	? idx > 0xffU
134	? idx > 0xffffU	192	? idx > 0xffffU
135	? idx > 0xffffffffU	193	? idx > 0xffffffffU
		194	? 11
136	? 7	195	: 7
137	: 6
138	: 5	196	: 5
139	: 4	197	: 4
140	: 3;	198	: 3;
141	}	199	}
142		200
…		…
179	static void	237	static void
180	encode_uint (enc_t *enc, int major, UV len)	238	encode_uint (enc_t *enc, int major, UV len)
181	{	239	{
182	need (enc, 9);	240	need (enc, 9);
183		241
184	if (len < 24)	242	if (ecb_expect_true (len < LENGTH_EXT1))
185	*enc->cur++ = major \| len;	243	*enc->cur++ = major \| len;
186	else if (len <= 0xff)	244	else if (ecb_expect_true (len <= 0xffU))
187	{	245	{
188	*enc->cur++ = major \| 24;	246	*enc->cur++ = major \| LENGTH_EXT1;
189	*enc->cur++ = len;	247	*enc->cur++ = len;
190	}	248	}
191	else if (len <= 0xffff)	249	else if (len <= 0xffffU)
192	{	250	{
193	*enc->cur++ = major \| 25;	251	*enc->cur++ = major \| LENGTH_EXT2;
194	*enc->cur++ = len >> 8;	252	*enc->cur++ = len >> 8;
195	*enc->cur++ = len;	253	*enc->cur++ = len;
196	}	254	}
197	else if (len <= 0xffffffff)	255	else if (len <= 0xffffffffU)
198	{	256	{
199	*enc->cur++ = major \| 26;	257	*enc->cur++ = major \| LENGTH_EXT4;
200	*enc->cur++ = len >> 24;	258	*enc->cur++ = len >> 24;
201	*enc->cur++ = len >> 16;	259	*enc->cur++ = len >> 16;
202	*enc->cur++ = len >> 8;	260	*enc->cur++ = len >> 8;
203	*enc->cur++ = len;	261	*enc->cur++ = len;
204	}	262	}
205	else	263	else
206	{	264	{
207	*enc->cur++ = major \| 27;	265	*enc->cur++ = major \| LENGTH_EXT8;
208	*enc->cur++ = len >> 56;	266	*enc->cur++ = len >> 56;
209	*enc->cur++ = len >> 48;	267	*enc->cur++ = len >> 48;
210	*enc->cur++ = len >> 40;	268	*enc->cur++ = len >> 40;
211	*enc->cur++ = len >> 32;	269	*enc->cur++ = len >> 32;
212	*enc->cur++ = len >> 24;	270	*enc->cur++ = len >> 24;
…		…
217	}	275	}
218		276
219	ecb_inline void	277	ecb_inline void
220	encode_tag (enc_t *enc, UV tag)	278	encode_tag (enc_t *enc, UV tag)
221	{	279	{
222	encode_uint (enc, 0xc0, tag);	280	encode_uint (enc, MAJOR_TAG, tag);
223	}	281	}
224		282
225	static void	283	// exceptional (hopefully) slow path for byte strings that need to be utf8-encoded
		284	ecb_noinline static void
226	encode_str (enc_t enc, int utf8, char str, STRLEN len)	285	encode_str_utf8 (enc_t enc, int utf8, char str, STRLEN len)
227	{	286	{
		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);
		317	need (enc, len);
		318	memcpy (enc->cur, str, len);
		319	enc->cur += len;
		320	}
		321
		322	ecb_inline void
		323	encode_strref (enc_t enc, int upgrade_utf8, int utf8, char str, STRLEN len)
		324	{
228	if (ecb_expect_false (enc->cbor.flags & F_ALLOW_STRINGREF))	325	if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS))
229	{	326	{
230	SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);	327	SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);
231		328
232	if (SvOK (*svp))	329	if (SvOK (*svp))
233	{	330	{
234	// already registered, use stringref	331	// already registered, use stringref
235	encode_tag (enc, CBOR_TAG_STRINGREF);	332	encode_tag (enc, CBOR_TAG_STRINGREF);
236	encode_uint (enc, 0x00, SvUV (*svp));	333	encode_uint (enc, MAJOR_POS_INT, SvUV (*svp));
237	return;	334	return;
238	}	335	}
239	else if (len >= minimum_string_length (enc->stringref_idx))	336	else if (len >= minimum_string_length (enc->stringref_idx))
240	{	337	{
241	// register only	338	// register only
242	sv_setuv (*svp, enc->stringref_idx);	339	sv_setuv (*svp, enc->stringref_idx);
243	++enc->stringref_idx;	340	++enc->stringref_idx;
244	}	341	}
245	}	342	}
246		343
247	encode_uint (enc, utf8 ? 0x60 : 0x40, len);	344	encode_str (enc, upgrade_utf8, utf8, str, len);
248	need (enc, len);
249	memcpy (enc->cur, str, len);
250	enc->cur += len;
251	}	345	}
252		346
253	static void encode_sv (enc_t enc, SV sv);	347	static void encode_sv (enc_t enc, SV sv);
254		348
255	static void	349	static void
…		…
260	if (enc->depth >= enc->cbor.max_depth)	354	if (enc->depth >= enc->cbor.max_depth)
261	croak (ERR_NESTING_EXCEEDED);	355	croak (ERR_NESTING_EXCEEDED);
262		356
263	++enc->depth;	357	++enc->depth;
264		358
265	encode_uint (enc, 0x80, len + 1);	359	encode_uint (enc, MAJOR_ARRAY, len + 1);
266		360
		361	if (SvMAGICAL (av))
267	for (i = 0; i <= len; ++i)	362	for (i = 0; i <= len; ++i)
268	{	363	{
269	SV **svp = av_fetch (av, i, 0);	364	SV **svp = av_fetch (av, i, 0);
270	encode_sv (enc, svp ? *svp : &PL_sv_undef);	365	encode_sv (enc, svp ? *svp : &PL_sv_undef);
271	}	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	}
272		373
273	--enc->depth;	374	--enc->depth;
274	}	375	}
275		376
276	static void	377	static void
…		…
285		386
286	int pairs = hv_iterinit (hv);	387	int pairs = hv_iterinit (hv);
287	int mg = SvMAGICAL (hv);	388	int mg = SvMAGICAL (hv);
288		389
289	if (mg)	390	if (mg)
290	encode_ch (enc, 0xa0 \| 31);	391	encode_ch (enc, MAJOR_MAP \| MINOR_INDEF);
291	else	392	else
292	encode_uint (enc, 0xa0, pairs);	393	encode_uint (enc, MAJOR_MAP, pairs);
293		394
294	while ((he = hv_iternext (hv)))	395	while ((he = hv_iternext (hv)))
295	{	396	{
296	if (HeKLEN (he) == HEf_SVKEY)	397	if (HeKLEN (he) == HEf_SVKEY)
297	encode_sv (enc, HeSVKEY (he));	398	encode_sv (enc, HeSVKEY (he));
298	else	399	else
299	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));
300		401
301	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));
302	}	403	}
303		404
304	if (mg)	405	if (mg)
305	encode_ch (enc, 0xe0 \| 31);	406	encode_ch (enc, MAJOR_MISC \| MINOR_INDEF);
306		407
307	--enc->depth;	408	--enc->depth;
308	}	409	}
309		410
310	// encode objects, arrays and special \0=false and \1=true values.	411	// encode objects, arrays and special \0=false and \1=true values.
311	static void	412	static void
312	encode_rv (enc_t enc, SV sv)	413	encode_rv (enc_t enc, SV sv)
313	{	414	{
314	SvGETMAGIC (sv);	415	SvGETMAGIC (sv);
315
316	if (ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)
317	&& ecb_expect_false (SvREFCNT (sv) > 1))
318	{
319	if (!enc->shareable)
320	enc->shareable = (HV )sv_2mortal ((SV )newHV ());
321
322	SV *svp = hv_fetch (enc->shareable, (char )&sv, sizeof (sv), 1);
323
324	if (SvOK (*svp))
325	{
326	encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
327	encode_uint (enc, 0x00, SvUV (*svp));
328	return;
329	}
330	else
331	{
332	sv_setuv (*svp, enc->shareable_idx);
333	++enc->shareable_idx;
334	encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
335	}
336	}
337		416
338	svtype svt = SvTYPE (sv);	417	svtype svt = SvTYPE (sv);
339		418
340	if (ecb_expect_false (SvOBJECT (sv)))	419	if (ecb_expect_false (SvOBJECT (sv)))
341	{	420	{
…		…
348	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash	427	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
349	? cbor_tagged_stash	428	? cbor_tagged_stash
350	: gv_stashpv ("CBOR::XS::Tagged" , 1);	429	: gv_stashpv ("CBOR::XS::Tagged" , 1);
351		430
352	HV *stash = SvSTASH (sv);	431	HV *stash = SvSTASH (sv);
353	GV *method;
354		432
355	if (stash == boolean_stash)	433	if (stash == boolean_stash)
356	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	}
357	else if (stash == error_stash)	438	else if (stash == error_stash)
358	encode_ch (enc, 0xe0 \| 23);	439	{
		440	encode_ch (enc, MAJOR_MISC \| SIMPLE_UNDEF);
		441	return;
		442	}
359	else if (stash == tagged_stash)	443	else if (stash == tagged_stash)
360	{	444	{
361	if (svt != SVt_PVAV)	445	if (svt != SVt_PVAV)
362	croak ("encountered CBOR::XS::Tagged object that isn't an array");	446	croak ("encountered CBOR::XS::Tagged object that isn't an array");
363		447
364	encode_uint (enc, 0xc0, SvUV (av_fetch ((AV )sv, 0, 1)));	448	encode_uint (enc, MAJOR_TAG, SvUV (av_fetch ((AV )sv, 0, 1)));
365	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))
366	}	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
367	else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))	482	if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
368	{	483	{
369	dSP;	484	dSP;
370		485
371	ENTER; SAVETMPS; PUSHMARK (SP);	486	ENTER; SAVETMPS;
		487	PUSHMARK (SP);
372	// 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
373	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));	489	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
374		490
375	PUTBACK;	491	PUTBACK;
376	// G_SCALAR ensures that return value is 1	492	// G_SCALAR ensures that return value is 1
…		…
389	}	505	}
390	else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)	506	else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
391	{	507	{
392	dSP;	508	dSP;
393		509
394	ENTER; SAVETMPS; PUSHMARK (SP);	510	ENTER; SAVETMPS;
		511	SAVESTACK_POS ();
		512	PUSHMARK (SP);
395	EXTEND (SP, 2);	513	EXTEND (SP, 2);
396	// 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
397	PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));	515	PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
398	PUSHs (sv_cbor);	516	PUSHs (sv_cbor);
399		517
…		…
404	// catch this surprisingly common error	522	// catch this surprisingly common error
405	if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)	523	if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
406	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));
407		525
408	encode_tag (enc, CBOR_TAG_PERL_OBJECT);	526	encode_tag (enc, CBOR_TAG_PERL_OBJECT);
409	encode_uint (enc, 0x80, count + 1);	527	encode_uint (enc, MAJOR_ARRAY, count + 1);
410	encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));	528	encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
411		529
412	while (count)	530	while (count)
413	encode_sv (enc, SP[1 - count--]);	531	encode_sv (enc, SP[1 - count--]);
414		532
415	PUTBACK;	533	PUTBACK;
…		…
436	{	554	{
437	double nv = SvNVX (sv);	555	double nv = SvNVX (sv);
438		556
439	need (enc, 9);	557	need (enc, 9);
440		558
441	if (ecb_expect_false (nv == (U32)nv))	559	if (ecb_expect_false (nv == (NV)(U32)nv))
442	encode_uint (enc, 0x00, (U32)nv);	560	encode_uint (enc, MAJOR_POS_INT, (U32)nv);
443	//TODO: maybe I32?	561	//TODO: maybe I32?
444	else if (ecb_expect_false (nv == (float)nv))	562	else if (ecb_expect_false (nv == (float)nv))
445	{	563	{
446	uint32_t fp = ecb_float_to_binary32 (nv);	564	uint32_t fp = ecb_float_to_binary32 (nv);
447		565
448	*enc->cur++ = 0xe0 \| 26;	566	*enc->cur++ = MAJOR_MISC \| MISC_FLOAT32;
449		567
450	if (!ecb_big_endian ())	568	if (!ecb_big_endian ())
451	fp = ecb_bswap32 (fp);	569	fp = ecb_bswap32 (fp);
452		570
453	memcpy (enc->cur, &fp, 4);	571	memcpy (enc->cur, &fp, 4);
…		…
455	}	573	}
456	else	574	else
457	{	575	{
458	uint64_t fp = ecb_double_to_binary64 (nv);	576	uint64_t fp = ecb_double_to_binary64 (nv);
459		577
460	*enc->cur++ = 0xe0 \| 27;	578	*enc->cur++ = MAJOR_MISC \| MISC_FLOAT64;
461		579
462	if (!ecb_big_endian ())	580	if (!ecb_big_endian ())
463	fp = ecb_bswap64 (fp);	581	fp = ecb_bswap64 (fp);
464		582
465	memcpy (enc->cur, &fp, 8);	583	memcpy (enc->cur, &fp, 8);
…		…
474		592
475	if (SvPOKp (sv))	593	if (SvPOKp (sv))
476	{	594	{
477	STRLEN len;	595	STRLEN len;
478	char *str = SvPV (sv, len);	596	char *str = SvPV (sv, len);
479	encode_str (enc, SvUTF8 (sv), str, len);	597	encode_strref (enc, enc->cbor.flags & F_TEXT_STRINGS, SvUTF8 (sv), str, len);
480	}	598	}
481	else if (SvNOKp (sv))	599	else if (SvNOKp (sv))
482	encode_nv (enc, sv);	600	encode_nv (enc, sv);
483	else if (SvIOKp (sv))	601	else if (SvIOKp (sv))
484	{	602	{
485	if (SvIsUV (sv))	603	if (SvIsUV (sv))
486	encode_uint (enc, 0x00, SvUVX (sv));	604	encode_uint (enc, MAJOR_POS_INT, SvUVX (sv));
487	else if (SvIVX (sv) >= 0)	605	else if (SvIVX (sv) >= 0)
488	encode_uint (enc, 0x00, SvIVX (sv));	606	encode_uint (enc, MAJOR_POS_INT, SvIVX (sv));
489	else	607	else
490	encode_uint (enc, 0x20, -(SvIVX (sv) + 1));	608	encode_uint (enc, MAJOR_NEG_INT, -(SvIVX (sv) + 1));
491	}	609	}
492	else if (SvROK (sv))	610	else if (SvROK (sv))
493	encode_rv (enc, SvRV (sv));	611	encode_rv (enc, SvRV (sv));
494	else if (!SvOK (sv))	612	else if (!SvOK (sv))
495	encode_ch (enc, 0xe0 \| 22);	613	encode_ch (enc, MAJOR_MISC \| SIMPLE_NULL);
496	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)	614	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
497	encode_ch (enc, 0xe0 \| 23);	615	encode_ch (enc, MAJOR_MISC \| SIMPLE_UNDEF);
498	else	616	else
499	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",
500	SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));	618	SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
501	}	619	}
502		620
503	static SV *	621	static SV *
504	encode_cbor (SV scalar, CBOR cbor)	622	encode_cbor (SV scalar, CBOR cbor)
505	{	623	{
506	enc_t enc = { };	624	enc_t enc = { 0 };
507		625
508	enc.cbor = *cbor;	626	enc.cbor = *cbor;
509	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	627	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
510	enc.cur = SvPVX (enc.sv);	628	enc.cur = SvPVX (enc.sv);
511	enc.end = SvEND (enc.sv);	629	enc.end = SvEND (enc.sv);
512		630
513	SvPOK_only (enc.sv);	631	SvPOK_only (enc.sv);
514		632
515	if (cbor->flags & F_ALLOW_STRINGREF)	633	if (cbor->flags & F_PACK_STRINGS)
516	{	634	{
517	encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE);	635	encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE);
518	enc.stringref[0]= (HV )sv_2mortal ((SV )newHV ());	636	enc.stringref[0]= (HV )sv_2mortal ((SV )newHV ());
519	enc.stringref[1]= (HV )sv_2mortal ((SV )newHV ());	637	enc.stringref[1]= (HV )sv_2mortal ((SV )newHV ());
520	}	638	}
…		…
542	CBOR cbor;	660	CBOR cbor;
543	U32 depth; // recursion depth	661	U32 depth; // recursion depth
544	U32 maxdepth; // recursion depth limit	662	U32 maxdepth; // recursion depth limit
545	AV *shareable;	663	AV *shareable;
546	AV *stringref;	664	AV *stringref;
		665	SV *decode_tagged;
		666	SV *err_sv; // optional sv for error, needs to be freed
547	} dec_t;	667	} dec_t;
548		668
549	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE	669	// set dec->err to ERRSV
		670	ecb_cold static void
		671	err_errsv (dec_t *dec)
		672	{
		673	if (!dec->err)
		674	{
		675	dec->err_sv = newSVsv (ERRSV);
550		676
551	#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")	677	// chop off the trailing \n
		678	SvCUR_set (dec->err_sv, SvCUR (dec->err_sv) - 1);
		679	*SvEND (dec->err_sv) = 0;
552		680
		681	dec->err = SvPVutf8_nolen (dec->err_sv);
		682	}
		683	}
		684
		685	// the following functions are used to reduce code size and help the compiler to optimise
		686	ecb_cold static void
		687	err_set (dec_t dec, const char reason)
		688	{
		689	if (!dec->err)
		690	dec->err = reason;
		691	}
		692
		693	ecb_cold static void
		694	err_unexpected_end (dec_t *dec)
		695	{
		696	err_set (dec, "unexpected end of CBOR data");
		697	}
		698
		699	ecb_cold static void
		700	err_nesting_exceeded (dec_t *dec)
		701	{
		702	err_set (dec, ERR_NESTING_EXCEEDED);
		703	}
		704
		705	#define ERR_DO(do) SB do; goto fail; SE
		706	#define ERR(reason) ERR_DO (err_set (dec, reason))
		707	#define ERR_ERRSV ERR_DO (err_errsv (dec))
		708
		709	#define WANT(len) if (ecb_expect_false ((UV)(dec->end - dec->cur) < (UV)len)) ERR_DO (err_unexpected_end (dec))
		710
553	#define DEC_INC_DEPTH if (++dec->depth > dec->cbor.max_depth) ERR (ERR_NESTING_EXCEEDED)	711	#define DEC_INC_DEPTH if (ecb_expect_false (++dec->depth > dec->cbor.max_depth)) ERR (ERR_NESTING_EXCEEDED)
554	#define DEC_DEC_DEPTH --dec->depth	712	#define DEC_DEC_DEPTH --dec->depth
555		713
556	static UV	714	static UV
557	decode_uint (dec_t *dec)	715	decode_uint (dec_t *dec)
558	{	716	{
559	switch (*dec->cur & 31)	717	U8 m = *dec->cur & MINOR_MASK;
560	{	718	++dec->cur;
561	case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:
562	case 8: case 9: case 10: case 11: case 12: case 13: case 14: case 15:
563	case 16: case 17: case 18: case 19: case 20: case 21: case 22: case 23:
564	return *dec->cur++ & 31;
565		719
566	case 24:	720	if (ecb_expect_true (m < LENGTH_EXT1))
		721	return m;
		722	else if (ecb_expect_true (m == LENGTH_EXT1))
		723	{
567	WANT (2);	724	WANT (1);
568	dec->cur += 2;	725	dec->cur += 1;
569	return dec->cur[-1];	726	return dec->cur[-1];
570		727	}
571	case 25:	728	else if (ecb_expect_true (m == LENGTH_EXT2))
		729	{
572	WANT (3);	730	WANT (2);
573	dec->cur += 3;	731	dec->cur += 2;
574	return (((UV)dec->cur[-2]) << 8)	732	return (((UV)dec->cur[-2]) << 8)
575	\| ((UV)dec->cur[-1]);	733	\| ((UV)dec->cur[-1]);
576		734	}
577	case 26:	735	else if (ecb_expect_true (m == LENGTH_EXT4))
		736	{
578	WANT (5);	737	WANT (4);
579	dec->cur += 5;	738	dec->cur += 4;
580	return (((UV)dec->cur[-4]) << 24)	739	return (((UV)dec->cur[-4]) << 24)
581	\| (((UV)dec->cur[-3]) << 16)	740	\| (((UV)dec->cur[-3]) << 16)
582	\| (((UV)dec->cur[-2]) << 8)	741	\| (((UV)dec->cur[-2]) << 8)
583	\| ((UV)dec->cur[-1]);	742	\| ((UV)dec->cur[-1]);
584		743	}
585	case 27:	744	else if (ecb_expect_true (m == LENGTH_EXT8))
		745	{
586	WANT (9);	746	WANT (8);
587	dec->cur += 9;	747	dec->cur += 8;
		748
		749	return
		750	#if UVSIZE < 8
		751	0
		752	#else
588	return (((UV)dec->cur[-8]) << 56)	753	(((UV)dec->cur[-8]) << 56)
589	\| (((UV)dec->cur[-7]) << 48)	754	\| (((UV)dec->cur[-7]) << 48)
590	\| (((UV)dec->cur[-6]) << 40)	755	\| (((UV)dec->cur[-6]) << 40)
591	\| (((UV)dec->cur[-5]) << 32)	756	\| (((UV)dec->cur[-5]) << 32)
		757	#endif
592	\| (((UV)dec->cur[-4]) << 24)	758	\| (((UV)dec->cur[-4]) << 24)
593	\| (((UV)dec->cur[-3]) << 16)	759	\| (((UV)dec->cur[-3]) << 16)
594	\| (((UV)dec->cur[-2]) << 8)	760	\| (((UV)dec->cur[-2]) << 8)
595	\| ((UV)dec->cur[-1]);	761	\| ((UV)dec->cur[-1]);
596		762	}
597	default:	763	else
598	ERR ("corrupted CBOR data (unsupported integer minor encoding)");	764	ERR ("corrupted CBOR data (unsupported integer minor encoding)");
599	}
600		765
601	fail:	766	fail:
602	return 0;	767	return 0;
603	}	768	}
604		769
…		…
609	{	774	{
610	AV *av = newAV ();	775	AV *av = newAV ();
611		776
612	DEC_INC_DEPTH;	777	DEC_INC_DEPTH;
613		778
614	if ((*dec->cur & 31) == 31)	779	if (*dec->cur == (MAJOR_ARRAY \| MINOR_INDEF))
615	{	780	{
616	++dec->cur;	781	++dec->cur;
617		782
618	for (;;)	783	for (;;)
619	{	784	{
620	WANT (1);	785	WANT (1);
621		786
622	if (*dec->cur == (0xe0 \| 31))	787	if (*dec->cur == (MAJOR_MISC \| MINOR_INDEF))
623	{	788	{
624	++dec->cur;	789	++dec->cur;
625	break;	790	break;
626	}	791	}
627		792
628	av_push (av, decode_sv (dec));	793	av_push (av, decode_sv (dec));
629	}	794	}
630	}	795	}
631	else	796	else
632	{	797	{
633	int i, len = decode_uint (dec);	798	UV i, len = decode_uint (dec);
634		799
		800	WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays
635	av_fill (av, len - 1);	801	av_fill (av, len - 1);
636		802
637	for (i = 0; i < len; ++i)	803	for (i = 0; i < len; ++i)
638	AvARRAY (av)[i] = decode_sv (dec);	804	AvARRAY (av)[i] = decode_sv (dec);
639	}	805	}
…		…
652	{	818	{
653	// for speed reasons, we specialcase single-string	819	// for speed reasons, we specialcase single-string
654	// byte or utf-8 strings as keys, but only when !stringref	820	// byte or utf-8 strings as keys, but only when !stringref
655		821
656	if (ecb_expect_true (!dec->stringref))	822	if (ecb_expect_true (!dec->stringref))
657	if (dec->cur >= 0x40 && dec->cur <= 0x40 + 27)	823	if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
658	{	824	{
659	I32 len = decode_uint (dec);	825	STRLEN len = decode_uint (dec);
660	char key = (char )dec->cur;	826	char key = (char )dec->cur;
661		827
		828	WANT (len);
662	dec->cur += len;	829	dec->cur += len;
663		830
664	if (ecb_expect_false (dec->stringref))
665	av_push (dec->stringref, newSVpvn (key, len));
666
667	hv_store (hv, key, len, decode_sv (dec), 0);	831	hv_store (hv, key, len, decode_sv (dec), 0);
668		832
669	return;	833	return;
670	}	834	}
671	else if (dec->cur >= 0x60 && dec->cur <= 0x60 + 27)	835	else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8))
672	{	836	{
673	I32 len = decode_uint (dec);	837	STRLEN len = decode_uint (dec);
674	char key = (char )dec->cur;	838	char key = (char )dec->cur;
675		839
		840	WANT (len);
676	dec->cur += len;	841	dec->cur += len;
677		842
678	if (ecb_expect_false (dec->stringref))	843	if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
679	av_push (dec->stringref, newSVpvn_utf8 (key, len, 1));	844	if (!is_utf8_string (key, len))
		845	ERR ("corrupted CBOR data (invalid UTF-8 in map key)");
680		846
681	hv_store (hv, key, -len, decode_sv (dec), 0);	847	hv_store (hv, key, -len, decode_sv (dec), 0);
682		848
683	return;	849	return;
684	}	850	}
685		851
686	SV *k = decode_sv (dec);	852	SV *k = decode_sv (dec);
687	SV *v = decode_sv (dec);	853	SV *v = decode_sv (dec);
688		854
		855	// we leak memory if uncaught exceptions are thrown by random magical
		856	// methods, and this is hopefully the only place where it can happen,
		857	// so if there is a chance of an exception, take the very slow path.
		858	// since catching exceptions is "undocumented/internal/forbidden" by
		859	// the new p5p powers, we need to call out to a perl function :/
		860	if (ecb_expect_false (SvAMAGIC (k)))
		861	{
		862	dSP;
		863
		864	ENTER; SAVETMPS;
		865	PUSHMARK (SP);
		866	EXTEND (SP, 3);
		867	PUSHs (sv_2mortal (newRV_inc ((SV *)hv)));
		868	PUSHs (sv_2mortal (k));
		869	PUSHs (sv_2mortal (v));
		870
		871	PUTBACK;
		872	call_pv ("CBOR::XS::_hv_store", G_VOID \| G_DISCARD \| G_EVAL);
		873	SPAGAIN;
		874
		875	FREETMPS; LEAVE;
		876
		877	if (SvTRUE (ERRSV))
		878	ERR_ERRSV;
		879
		880	return;
		881	}
		882
689	hv_store_ent (hv, k, v, 0);	883	hv_store_ent (hv, k, v, 0);
690	SvREFCNT_dec (k);	884	SvREFCNT_dec (k);
		885
		886	fail:
		887	;
691	}	888	}
692		889
693	static SV *	890	static SV *
694	decode_hv (dec_t *dec)	891	decode_hv (dec_t *dec)
695	{	892	{
696	HV *hv = newHV ();	893	HV *hv = newHV ();
697		894
698	DEC_INC_DEPTH;	895	DEC_INC_DEPTH;
699		896
700	if ((*dec->cur & 31) == 31)	897	if (*dec->cur == (MAJOR_MAP \| MINOR_INDEF))
701	{	898	{
702	++dec->cur;	899	++dec->cur;
703		900
704	for (;;)	901	for (;;)
705	{	902	{
706	WANT (1);	903	WANT (1);
707		904
708	if (*dec->cur == (0xe0 \| 31))	905	if (*dec->cur == (MAJOR_MISC \| MINOR_INDEF))
709	{	906	{
710	++dec->cur;	907	++dec->cur;
711	break;	908	break;
712	}	909	}
713		910
714	decode_he (dec, hv);	911	decode_he (dec, hv);
715	}	912	}
716	}	913	}
717	else	914	else
718	{	915	{
719	int pairs = decode_uint (dec);	916	UV pairs = decode_uint (dec);
		917
		918	WANT (pairs); // complexity check - need at least one byte per value, do not allow supersize hashes
720		919
721	while (pairs--)	920	while (pairs--)
722	decode_he (dec, hv);	921	decode_he (dec, hv);
723	}	922	}
724		923
…		…
734	static SV *	933	static SV *
735	decode_str (dec_t *dec, int utf8)	934	decode_str (dec_t *dec, int utf8)
736	{	935	{
737	SV *sv = 0;	936	SV *sv = 0;
738		937
739	if ((*dec->cur & 31) == 31)	938	if ((*dec->cur & MINOR_MASK) == MINOR_INDEF)
740	{	939	{
		940	// indefinite length strings
741	++dec->cur;	941	++dec->cur;
742		942
		943	U8 major = *dec->cur & MAJOR_MISC;
		944
743	sv = newSVpvn ("", 0);	945	sv = newSVpvn ("", 0);
744		946
745	// not very fast, and certainly not robust against illegal input
746	for (;;)	947	for (;;)
747	{	948	{
748	WANT (1);	949	WANT (1);
749		950
750	if (*dec->cur == (0xe0 \| 31))	951	if ((*dec->cur - major) > LENGTH_EXT8)
		952	if (*dec->cur == (MAJOR_MISC \| MINOR_INDEF))
751	{	953	{
752	++dec->cur;	954	++dec->cur;
753	break;	955	break;
754	}	956	}
		957	else
		958	ERR ("corrupted CBOR data (invalid chunks in indefinite length string)");
755		959
756	sv_catsv (sv, decode_sv (dec));	960	STRLEN len = decode_uint (dec);
		961
		962	WANT (len);
		963	sv_catpvn (sv, dec->cur, len);
		964	dec->cur += len;
757	}	965	}
758	}	966	}
759	else	967	else
760	{	968	{
761	STRLEN len = decode_uint (dec);	969	STRLEN len = decode_uint (dec);
…		…
768	&& SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1))	976	&& SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1))
769	av_push (dec->stringref, SvREFCNT_inc_NN (sv));	977	av_push (dec->stringref, SvREFCNT_inc_NN (sv));
770	}	978	}
771		979
772	if (utf8)	980	if (utf8)
		981	{
		982	if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
		983	if (!is_utf8_string (SvPVX (sv), SvCUR (sv)))
		984	ERR ("corrupted CBOR data (invalid UTF-8 in text string)");
		985
773	SvUTF8_on (sv);	986	SvUTF8_on (sv);
		987	}
774		988
775	return sv;	989	return sv;
776		990
777	fail:	991	fail:
778	SvREFCNT_dec (sv);	992	SvREFCNT_dec (sv);
…		…
797	sv = newRV_noinc (decode_sv (dec));	1011	sv = newRV_noinc (decode_sv (dec));
798	break;	1012	break;
799		1013
800	case CBOR_TAG_STRINGREF_NAMESPACE:	1014	case CBOR_TAG_STRINGREF_NAMESPACE:
801	{	1015	{
		1016	// do nmot use SAVETMPS/FREETMPS, as these will
		1017	// erase mortalised caches, e.g. "shareable"
802	ENTER; SAVETMPS;	1018	ENTER;
803		1019
804	SAVESPTR (dec->stringref);	1020	SAVESPTR (dec->stringref);
805	dec->stringref = (AV )sv_2mortal ((SV )newAV ());	1021	dec->stringref = (AV )sv_2mortal ((SV )newAV ());
806		1022
807	sv = decode_sv (dec);	1023	sv = decode_sv (dec);
808		1024
809	FREETMPS; LEAVE;	1025	LEAVE;
810	}	1026	}
811	break;	1027	break;
812		1028
813	case CBOR_TAG_STRINGREF:	1029	case CBOR_TAG_STRINGREF:
814	{	1030	{
815	if ((*dec->cur >> 5) != 0)	1031	if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
816	ERR ("corrupted CBOR data (stringref index not an unsigned integer)");	1032	ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
817		1033
818	UV idx = decode_uint (dec);	1034	UV idx = decode_uint (dec);
819		1035
820	if (!dec->stringref \|\| (int)idx > AvFILLp (dec->stringref))	1036	if (!dec->stringref \|\| (int)idx > AvFILLp (dec->stringref))
…		…
827	case CBOR_TAG_VALUE_SHAREABLE:	1043	case CBOR_TAG_VALUE_SHAREABLE:
828	{	1044	{
829	if (ecb_expect_false (!dec->shareable))	1045	if (ecb_expect_false (!dec->shareable))
830	dec->shareable = (AV )sv_2mortal ((SV )newAV ());	1046	dec->shareable = (AV )sv_2mortal ((SV )newAV ());
831		1047
		1048	if (dec->cbor.flags & F_ALLOW_CYCLES)
		1049	{
832	sv = newSV (0);	1050	sv = newSV (0);
833	av_push (dec->shareable, SvREFCNT_inc_NN (sv));	1051	av_push (dec->shareable, SvREFCNT_inc_NN (sv));
834		1052
835	SV *osv = decode_sv (dec);	1053	SV *osv = decode_sv (dec);
836	sv_setsv (sv, osv);	1054	sv_setsv (sv, osv);
837	SvREFCNT_dec_NN (osv);	1055	SvREFCNT_dec_NN (osv);
		1056	}
		1057	else
		1058	{
		1059	av_push (dec->shareable, &PL_sv_undef);
		1060	int idx = AvFILLp (dec->shareable);
		1061	sv = decode_sv (dec);
		1062	av_store (dec->shareable, idx, SvREFCNT_inc_NN (sv));
		1063	}
838	}	1064	}
839	break;	1065	break;
840		1066
841	case CBOR_TAG_VALUE_SHAREDREF:	1067	case CBOR_TAG_VALUE_SHAREDREF:
842	{	1068	{
843	if ((*dec->cur >> 5) != 0)	1069	if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
844	ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");	1070	ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
845		1071
846	UV idx = decode_uint (dec);	1072	UV idx = decode_uint (dec);
847		1073
848	if (!dec->shareable \|\| (int)idx > AvFILLp (dec->shareable))	1074	if (!dec->shareable \|\| (int)idx > AvFILLp (dec->shareable))
849	ERR ("corrupted CBOR data (sharedref index out of bounds)");	1075	ERR ("corrupted CBOR data (sharedref index out of bounds)");
850		1076
851	sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);	1077	sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
		1078
		1079	if (sv == &PL_sv_undef)
		1080	ERR ("cyclic CBOR data structure found, but allow_cycles is not enabled");
852	}	1081	}
853	break;	1082	break;
854		1083
855	case CBOR_TAG_PERL_OBJECT:	1084	case CBOR_TAG_PERL_OBJECT:
856	{	1085	{
…		…
871	if (!method)	1100	if (!method)
872	ERR ("cannot decode perl-object (package does not have a THAW method)");	1101	ERR ("cannot decode perl-object (package does not have a THAW method)");
873		1102
874	dSP;	1103	dSP;
875		1104
876	ENTER; SAVETMPS; PUSHMARK (SP);	1105	ENTER; SAVETMPS;
		1106	PUSHMARK (SP);
877	EXTEND (SP, len + 1);	1107	EXTEND (SP, len + 1);
878	// we re-bless the reference to get overload and other niceties right	1108	// we re-bless the reference to get overload and other niceties right
879	PUSHs (*av_fetch (av, 0, 1));	1109	PUSHs (*av_fetch (av, 0, 1));
880	PUSHs (sv_cbor);	1110	PUSHs (sv_cbor);
881		1111
…		…
889	SPAGAIN;	1119	SPAGAIN;
890		1120
891	if (SvTRUE (ERRSV))	1121	if (SvTRUE (ERRSV))
892	{	1122	{
893	FREETMPS; LEAVE;	1123	FREETMPS; LEAVE;
894	ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));	1124	ERR_ERRSV;
895	}	1125	}
896		1126
897	SvREFCNT_dec (sv);	1127	SvREFCNT_dec (sv);
898	sv = SvREFCNT_inc (POPs);	1128	sv = SvREFCNT_inc (POPs);
899		1129
…		…
903	}	1133	}
904	break;	1134	break;
905		1135
906	default:	1136	default:
907	{	1137	{
		1138	SV *tag_sv = newSVuv (tag);
		1139
908	sv = decode_sv (dec);	1140	sv = decode_sv (dec);
909		1141
		1142	dSP;
		1143	ENTER; SAVETMPS;
		1144	SAVESTACK_POS ();
		1145	PUSHMARK (SP);
		1146	EXTEND (SP, 2);
		1147	PUSHs (tag_sv);
		1148	PUSHs (sv);
		1149
		1150	PUTBACK;
		1151	int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY \| G_EVAL);
		1152	SPAGAIN;
		1153
		1154	if (SvTRUE (ERRSV))
		1155	{
		1156	SvREFCNT_dec (tag_sv);
		1157	FREETMPS; LEAVE;
		1158	ERR_ERRSV;
		1159	}
		1160
		1161	if (count)
		1162	{
		1163	SvREFCNT_dec (tag_sv);
		1164	SvREFCNT_dec (sv);
		1165	sv = SvREFCNT_inc (POPs);
		1166	}
		1167	else
		1168	{
910	AV *av = newAV ();	1169	AV *av = newAV ();
911	av_push (av, newSVuv (tag));	1170	av_push (av, tag_sv);
912	av_push (av, sv);	1171	av_push (av, sv);
913		1172
914	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash	1173	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
915	? cbor_tagged_stash	1174	? cbor_tagged_stash
916	: gv_stashpv ("CBOR::XS::Tagged" , 1);	1175	: gv_stashpv ("CBOR::XS::Tagged" , 1);
917
918	sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash);	1176	sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash);
		1177	}
		1178
		1179	PUTBACK;
		1180
		1181	FREETMPS; LEAVE;
919	}	1182	}
920	break;	1183	break;
921	}	1184	}
922		1185
923	return sv;	1186	return sv;
…		…
930	static SV *	1193	static SV *
931	decode_sv (dec_t *dec)	1194	decode_sv (dec_t *dec)
932	{	1195	{
933	WANT (1);	1196	WANT (1);
934		1197
935	switch (*dec->cur >> 5)	1198	switch (*dec->cur >> MAJOR_SHIFT)
936	{	1199	{
937	case 0: // unsigned int	1200	case MAJOR_POS_INT >> MAJOR_SHIFT: return newSVuv (decode_uint (dec));
938	return newSVuv (decode_uint (dec));	1201	case MAJOR_NEG_INT >> MAJOR_SHIFT: return newSViv (-1 - (IV)decode_uint (dec));
939	case 1: // negative int	1202	case MAJOR_BYTES >> MAJOR_SHIFT: return decode_str (dec, 0);
940	return newSViv (-1 - (IV)decode_uint (dec));	1203	case MAJOR_TEXT >> MAJOR_SHIFT: return decode_str (dec, 1);
941	case 2: // octet string	1204	case MAJOR_ARRAY >> MAJOR_SHIFT: return decode_av (dec);
942	return decode_str (dec, 0);	1205	case MAJOR_MAP >> MAJOR_SHIFT: return decode_hv (dec);
943	case 3: // utf-8 string	1206	case MAJOR_TAG >> MAJOR_SHIFT: return decode_tagged (dec);
944	return decode_str (dec, 1);	1207
945	case 4: // array	1208	case MAJOR_MISC >> MAJOR_SHIFT:
946	return decode_av (dec);
947	case 5: // map
948	return decode_hv (dec);
949	case 6: // tag
950	return decode_tagged (dec);
951	case 7: // misc
952	switch (*dec->cur++ & 31)	1209	switch (*dec->cur++ & MINOR_MASK)
953	{	1210	{
954	case 20:	1211	case SIMPLE_FALSE:
955	#if CBOR_SLOW	1212	#if CBOR_SLOW
956	types_false = get_bool ("Types::Serialiser::false");	1213	types_false = get_bool ("Types::Serialiser::false");
957	#endif	1214	#endif
958	return newSVsv (types_false);	1215	return newSVsv (types_false);
959	case 21:	1216	case SIMPLE_TRUE:
960	#if CBOR_SLOW	1217	#if CBOR_SLOW
961	types_true = get_bool ("Types::Serialiser::true");	1218	types_true = get_bool ("Types::Serialiser::true");
962	#endif	1219	#endif
963	return newSVsv (types_true);	1220	return newSVsv (types_true);
964	case 22:	1221	case SIMPLE_NULL:
965	return newSVsv (&PL_sv_undef);	1222	return newSVsv (&PL_sv_undef);
966	case 23:	1223	case SIMPLE_UNDEF:
967	#if CBOR_SLOW	1224	#if CBOR_SLOW
968	types_error = get_bool ("Types::Serialiser::error");	1225	types_error = get_bool ("Types::Serialiser::error");
969	#endif	1226	#endif
970	return newSVsv (types_error);	1227	return newSVsv (types_error);
971		1228
972	case 25:	1229	case MISC_FLOAT16:
973	{	1230	{
974	WANT (2);	1231	WANT (2);
975		1232
976	uint16_t fp = (dec->cur[0] << 8) \| dec->cur[1];	1233	uint16_t fp = (dec->cur[0] << 8) \| dec->cur[1];
977	dec->cur += 2;	1234	dec->cur += 2;
978		1235
979	return newSVnv (ecb_binary16_to_float (fp));	1236	return newSVnv (ecb_binary16_to_float (fp));
980	}	1237	}
981		1238
982	case 26:	1239	case MISC_FLOAT32:
983	{	1240	{
984	uint32_t fp;	1241	uint32_t fp;
985	WANT (4);	1242	WANT (4);
986	memcpy (&fp, dec->cur, 4);	1243	memcpy (&fp, dec->cur, 4);
987	dec->cur += 4;	1244	dec->cur += 4;
…		…
990	fp = ecb_bswap32 (fp);	1247	fp = ecb_bswap32 (fp);
991		1248
992	return newSVnv (ecb_binary32_to_float (fp));	1249	return newSVnv (ecb_binary32_to_float (fp));
993	}	1250	}
994		1251
995	case 27:	1252	case MISC_FLOAT64:
996	{	1253	{
997	uint64_t fp;	1254	uint64_t fp;
998	WANT (8);	1255	WANT (8);
999	memcpy (&fp, dec->cur, 8);	1256	memcpy (&fp, dec->cur, 8);
1000	dec->cur += 8;	1257	dec->cur += 8;
…		…
1003	fp = ecb_bswap64 (fp);	1260	fp = ecb_bswap64 (fp);
1004		1261
1005	return newSVnv (ecb_binary64_to_double (fp));	1262	return newSVnv (ecb_binary64_to_double (fp));
1006	}	1263	}
1007		1264
1008	// 0..19 unassigned	1265	// 0..19 unassigned simple
1009	// 24 reserved + unassigned (reserved values are not encodable)	1266	// 24 reserved + unassigned simple (reserved values are not encodable)
		1267	// 28-30 unassigned misc
		1268	// 31 break code
1010	default:	1269	default:
1011	ERR ("corrupted CBOR data (reserved/unassigned major 7 value)");	1270	ERR ("corrupted CBOR data (reserved/unassigned/unexpected major 7 value)");
1012	}	1271	}
1013		1272
1014	break;	1273	break;
1015	}	1274	}
1016		1275
…		…
1019	}	1278	}
1020		1279
1021	static SV *	1280	static SV *
1022	decode_cbor (SV string, CBOR cbor, char **offset_return)	1281	decode_cbor (SV string, CBOR cbor, char **offset_return)
1023	{	1282	{
1024	dec_t dec = { };	1283	dec_t dec = { 0 };
1025	SV *sv;	1284	SV *sv;
1026	STRLEN len;	1285	STRLEN len;
1027	char *data = SvPVbyte (string, len);	1286	char *data = SvPVbyte (string, len);
1028		1287
1029	if (len > cbor->max_size && cbor->max_size)	1288	if (len > cbor->max_size && cbor->max_size)
…		…
1043	if (dec.cur != dec.end && !dec.err)	1302	if (dec.cur != dec.end && !dec.err)
1044	dec.err = "garbage after CBOR object";	1303	dec.err = "garbage after CBOR object";
1045		1304
1046	if (dec.err)	1305	if (dec.err)
1047	{	1306	{
		1307	if (dec.shareable)
		1308	{
		1309	// need to break cyclic links, which would all be in shareable
		1310	int i;
		1311	SV **svp;
		1312
		1313	for (i = av_len (dec.shareable) + 1; i--; )
		1314	if ((svp = av_fetch (dec.shareable, i, 0)))
		1315	sv_setsv (*svp, &PL_sv_undef);
		1316	}
		1317
1048	SvREFCNT_dec (sv);	1318	SvREFCNT_dec (sv);
		1319
		1320	if (dec.err_sv)
		1321	sv_2mortal (dec.err_sv);
		1322
1049	croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 )data, (int)(uint8_t)dec.cur);	1323	croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 )data, (int)(uint8_t)dec.cur);
1050	}	1324	}
1051		1325
1052	sv = sv_2mortal (sv);	1326	sv = sv_2mortal (sv);
1053		1327
1054	return sv;	1328	return sv;
1055	}	1329	}
1056		1330
		1331	/////////////////////////////////////////////////////////////////////////////
		1332	// incremental parser
		1333
		1334	#define INCR_DONE(cbor) (AvFILLp (cbor->incr_count) < 0)
		1335
		1336	// returns 0 for notyet, 1 for success or error
		1337	static int
		1338	incr_parse (CBOR self, SV cborstr)
		1339	{
		1340	STRLEN cur;
		1341	SvPV (cborstr, cur);
		1342
		1343	while (ecb_expect_true (self->incr_need <= cur))
		1344	{
		1345	// table of integer count bytes
		1346	static I8 incr_len[MINOR_MASK + 1] = {
		1347	0, 0, 0, 0, 0, 0, 0, 0,
		1348	0, 0, 0, 0, 0, 0, 0, 0,
		1349	0, 0, 0, 0, 0, 0, 0, 0,
		1350	1, 2, 4, 8,-1,-1,-1,-2
		1351	};
		1352
		1353	const U8 *p = SvPVX (cborstr) + self->incr_pos;
		1354	U8 m = *p & MINOR_MASK;
		1355	IV count = SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]);
		1356	I8 ilen = incr_len[m];
		1357
		1358	self->incr_need = self->incr_pos + 1;
		1359
		1360	if (ecb_expect_false (ilen < 0))
		1361	{
		1362	if (m != MINOR_INDEF)
		1363	return 1; // error
		1364
		1365	if (*p == (MAJOR_MISC \| MINOR_INDEF))
		1366	{
		1367	if (count >= 0)
		1368	return 1; // error
		1369
		1370	count = 1;
		1371	}
		1372	else
		1373	{
		1374	av_push (self->incr_count, newSViv (-1)); //TODO: nest
		1375	count = -1;
		1376	}
		1377	}
		1378	else
		1379	{
		1380	self->incr_need += ilen;
		1381	if (ecb_expect_false (self->incr_need > cur))
		1382	return 0;
		1383
		1384	int major = *p >> MAJOR_SHIFT;
		1385
		1386	switch (major)
		1387	{
		1388	case MAJOR_TAG >> MAJOR_SHIFT:
		1389	++count; // tags merely prefix another value
		1390	break;
		1391
		1392	case MAJOR_BYTES >> MAJOR_SHIFT:
		1393	case MAJOR_TEXT >> MAJOR_SHIFT:
		1394	case MAJOR_ARRAY >> MAJOR_SHIFT:
		1395	case MAJOR_MAP >> MAJOR_SHIFT:
		1396	{
		1397	UV len;
		1398
		1399	if (ecb_expect_false (ilen))
		1400	{
		1401	len = 0;
		1402
		1403	do {
		1404	len = (len << 8) \| *++p;
		1405	} while (--ilen);
		1406	}
		1407	else
		1408	len = m;
		1409
		1410	switch (major)
		1411	{
		1412	case MAJOR_BYTES >> MAJOR_SHIFT:
		1413	case MAJOR_TEXT >> MAJOR_SHIFT:
		1414	self->incr_need += len;
		1415	if (ecb_expect_false (self->incr_need > cur))
		1416	return 0;
		1417
		1418	break;
		1419
		1420	case MAJOR_MAP >> MAJOR_SHIFT:
		1421	len <<= 1;
		1422	case MAJOR_ARRAY >> MAJOR_SHIFT:
		1423	if (len)
		1424	{
		1425	av_push (self->incr_count, newSViv (len + 1)); //TODO: nest
		1426	count = len + 1;
		1427	}
		1428	break;
		1429	}
		1430	}
		1431	}
		1432	}
		1433
		1434	self->incr_pos = self->incr_need;
		1435
		1436	if (count > 0)
		1437	{
		1438	while (!--count)
		1439	{
		1440	if (!AvFILLp (self->incr_count))
		1441	return 1; // done
		1442
		1443	SvREFCNT_dec_NN (av_pop (self->incr_count));
		1444	count = SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]);
		1445	}
		1446
		1447	SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]) = count;
		1448	}
		1449	}
		1450
		1451	return 0;
		1452	}
		1453
		1454
1057	/////////////////////////////////////////////////////////////////////////////	1455	/////////////////////////////////////////////////////////////////////////////
1058	// XS interface functions	1456	// XS interface functions
1059		1457
1060	MODULE = CBOR::XS PACKAGE = CBOR::XS	1458	MODULE = CBOR::XS PACKAGE = CBOR::XS
1061		1459
…		…
1069		1467
1070	types_true = get_bool ("Types::Serialiser::true" );	1468	types_true = get_bool ("Types::Serialiser::true" );
1071	types_false = get_bool ("Types::Serialiser::false");	1469	types_false = get_bool ("Types::Serialiser::false");
1072	types_error = get_bool ("Types::Serialiser::error");	1470	types_error = get_bool ("Types::Serialiser::error");
1073		1471
		1472	default_filter = newSVpv ("CBOR::XS::default_filter", 0);
		1473
1074	sv_cbor = newSVpv ("CBOR", 0);	1474	sv_cbor = newSVpv ("CBOR", 0);
1075	SvREADONLY_on (sv_cbor);	1475	SvREADONLY_on (sv_cbor);
		1476
		1477	assert (("STRLEN must be an unsigned type", 0 <= (STRLEN)-1));
1076	}	1478	}
1077		1479
1078	PROTOTYPES: DISABLE	1480	PROTOTYPES: DISABLE
1079		1481
1080	void CLONE (...)	1482	void CLONE (...)
…		…
1099	void shrink (CBOR *self, int enable = 1)	1501	void shrink (CBOR *self, int enable = 1)
1100	ALIAS:	1502	ALIAS:
1101	shrink = F_SHRINK	1503	shrink = F_SHRINK
1102	allow_unknown = F_ALLOW_UNKNOWN	1504	allow_unknown = F_ALLOW_UNKNOWN
1103	allow_sharing = F_ALLOW_SHARING	1505	allow_sharing = F_ALLOW_SHARING
1104	allow_stringref = F_ALLOW_STRINGREF	1506	allow_cycles = F_ALLOW_CYCLES
		1507	pack_strings = F_PACK_STRINGS
		1508	text_keys = F_TEXT_KEYS
		1509	text_strings = F_TEXT_STRINGS
		1510	validate_utf8 = F_VALIDATE_UTF8
1105	PPCODE:	1511	PPCODE:
1106	{	1512	{
1107	if (enable)	1513	if (enable)
1108	self->flags \|= ix;	1514	self->flags \|= ix;
1109	else	1515	else
…		…
1115	void get_shrink (CBOR *self)	1521	void get_shrink (CBOR *self)
1116	ALIAS:	1522	ALIAS:
1117	get_shrink = F_SHRINK	1523	get_shrink = F_SHRINK
1118	get_allow_unknown = F_ALLOW_UNKNOWN	1524	get_allow_unknown = F_ALLOW_UNKNOWN
1119	get_allow_sharing = F_ALLOW_SHARING	1525	get_allow_sharing = F_ALLOW_SHARING
1120	get_allow_stringref = F_ALLOW_STRINGREF	1526	get_allow_cycles = F_ALLOW_CYCLES
		1527	get_pack_strings = F_PACK_STRINGS
		1528	get_text_keys = F_TEXT_KEYS
		1529	get_text_strings = F_TEXT_STRINGS
		1530	get_validate_utf8 = F_VALIDATE_UTF8
1121	PPCODE:	1531	PPCODE:
1122	XPUSHs (boolSV (self->flags & ix));	1532	XPUSHs (boolSV (self->flags & ix));
1123		1533
1124	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)	1534	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
1125	PPCODE:	1535	PPCODE:
…		…
1138	XPUSHs (ST (0));	1548	XPUSHs (ST (0));
1139		1549
1140	int get_max_size (CBOR *self)	1550	int get_max_size (CBOR *self)
1141	CODE:	1551	CODE:
1142	RETVAL = self->max_size;	1552	RETVAL = self->max_size;
		1553	OUTPUT:
		1554	RETVAL
		1555
		1556	void filter (CBOR self, SV filter = 0)
		1557	PPCODE:
		1558	SvREFCNT_dec (self->filter);
		1559	self->filter = filter ? newSVsv (filter) : filter;
		1560	XPUSHs (ST (0));
		1561
		1562	SV get_filter (CBOR self)
		1563	CODE:
		1564	RETVAL = self->filter ? self->filter : NEWSV (0, 0);
1143	OUTPUT:	1565	OUTPUT:
1144	RETVAL	1566	RETVAL
1145		1567
1146	void encode (CBOR self, SV scalar)	1568	void encode (CBOR self, SV scalar)
1147	PPCODE:	1569	PPCODE:
…		…
1162	EXTEND (SP, 2);	1584	EXTEND (SP, 2);
1163	PUSHs (sv);	1585	PUSHs (sv);
1164	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));	1586	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1165	}	1587	}
1166		1588
		1589	void incr_parse (CBOR self, SV cborstr)
		1590	ALIAS:
		1591	incr_parse_multiple = 1
		1592	PPCODE:
		1593	{
		1594	if (SvUTF8 (cborstr))
		1595	sv_utf8_downgrade (cborstr, 0);
		1596
		1597	if (!self->incr_count)
		1598	{
		1599	self->incr_count = newAV ();
		1600	self->incr_pos = 0;
		1601	self->incr_need = 1;
		1602
		1603	av_push (self->incr_count, newSViv (1));
		1604	}
		1605
		1606	do
		1607	{
		1608	if (!incr_parse (self, cborstr))
		1609	{
		1610	if (self->incr_need > self->max_size && self->max_size)
		1611	croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",
		1612	(unsigned long)self->incr_need, (unsigned long)self->max_size);
		1613
		1614	break;
		1615	}
		1616
		1617	SV *sv;
		1618	char *offset;
		1619
		1620	PUTBACK; sv = decode_cbor (cborstr, self, &offset); SPAGAIN;
		1621	XPUSHs (sv);
		1622
		1623	sv_chop (cborstr, offset);
		1624
		1625	av_clear (self->incr_count);
		1626	av_push (self->incr_count, newSViv (1));
		1627
		1628	self->incr_pos = 0;
		1629	self->incr_need = self->incr_pos + 1;
		1630	}
		1631	while (ix);
		1632	}
		1633
		1634	void incr_reset (CBOR *self)
		1635	CODE:
		1636	{
		1637	SvREFCNT_dec (self->incr_count);
		1638	self->incr_count = 0;
		1639	}
		1640
		1641	void DESTROY (CBOR *self)
		1642	PPCODE:
		1643	cbor_free (self);
		1644
1167	PROTOTYPES: ENABLE	1645	PROTOTYPES: ENABLE
1168		1646
1169	void encode_cbor (SV *scalar)	1647	void encode_cbor (SV *scalar)
		1648	ALIAS:
		1649	encode_cbor = 0
		1650	encode_cbor_sharing = F_ALLOW_SHARING
1170	PPCODE:	1651	PPCODE:
1171	{	1652	{
1172	CBOR cbor;	1653	CBOR cbor;
1173	cbor_init (&cbor);	1654	cbor_init (&cbor);
		1655	cbor.flags \|= ix;
1174	PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN;	1656	PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN;
1175	XPUSHs (scalar);	1657	XPUSHs (scalar);
1176	}	1658	}
1177		1659
1178	void decode_cbor (SV *cborstr)	1660	void decode_cbor (SV *cborstr)

Diff Legend

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

Comparing CBOR-XS/XS.xs (file contents): Revision 1.26 by root, Fri Nov 22 09:40:13 2013 UTC vs. Revision 1.59 by root, Fri Nov 25 23:37:27 2016 UTC

Diff Legend

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.26 by root, Fri Nov 22 09:40:13 2013 UTC vs.
Revision 1.59 by root, Fri Nov 25 23:37:27 2016 UTC