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.61 by root, Sat Nov 26 02:10:19 2016 UTC

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

Diff Legend

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