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

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.1 by root, Fri Oct 25 23:09:45 2013 UTC vs.
Revision 1.33 by root, Sat Nov 30 15:23:59 2013 UTC

…		…
9	#include <limits.h>	9	#include <limits.h>
10	#include <float.h>	10	#include <float.h>
11		11
12	#include "ecb.h"	12	#include "ecb.h"
13		13
14	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	14	// compatibility with perl <5.18
15	# define snprintf _snprintf // C compilers have this in stdio.h	15	#ifndef HvNAMELEN_get
		16	# define HvNAMELEN_get(hv) strlen (HvNAME (hv))
16	#endif	17	#endif
		18	#ifndef HvNAMELEN
		19	# define HvNAMELEN(hv) HvNAMELEN_get (hv)
		20	#endif
		21	#ifndef HvNAMEUTF8
		22	# define HvNAMEUTF8(hv) 0
		23	#endif
		24	#ifndef SvREFCNT_dec_NN
		25	# define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
		26	#endif
17		27
		28	// known tags
		29	enum cbor_tag
		30	{
		31	// extensions
		32	CBOR_TAG_STRINGREF = 25, // http://cbor.schmorp.de/stringref
		33	CBOR_TAG_PERL_OBJECT = 26, // http://cbor.schmorp.de/perl-object
		34	CBOR_TAG_GENERIC_OBJECT = 27, // http://cbor.schmorp.de/generic-object
		35	CBOR_TAG_VALUE_SHAREABLE = 28, // http://cbor.schmorp.de/value-sharing
		36	CBOR_TAG_VALUE_SHAREDREF = 29, // http://cbor.schmorp.de/value-sharing
		37	CBOR_TAG_STRINGREF_NAMESPACE = 256, // http://cbor.schmorp.de/stringref
		38	CBOR_TAG_INDIRECTION = 22098, // http://cbor.schmorp.de/indirection
		39
		40	// rfc7049
		41	CBOR_TAG_DATETIME = 0, // rfc4287, utf-8
		42	CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any
		43	CBOR_TAG_POS_BIGNUM = 2, // byte string
		44	CBOR_TAG_NEG_BIGNUM = 3, // byte string
		45	CBOR_TAG_DECIMAL = 4, // decimal fraction, array
		46	CBOR_TAG_BIGFLOAT = 5, // array
		47
		48	CBOR_TAG_CONV_B64U = 21, // base64url, any
		49	CBOR_TAG_CONV_B64 = 22, // base64, any
		50	CBOR_TAG_CONV_HEX = 23, // base16, any
		51	CBOR_TAG_CBOR = 24, // embedded cbor, byte string
		52
		53	CBOR_TAG_URI = 32, // URI rfc3986, utf-8
		54	CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8
		55	CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8
		56	CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8
		57	CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
		58
		59	CBOR_TAG_MAGIC = 55799 // self-describe cbor
		60	};
		61
18	#define F_SHRINK 0x00000200UL	62	#define F_SHRINK 0x00000001UL
19	#define F_ALLOW_UNKNOWN 0x00002000UL	63	#define F_ALLOW_UNKNOWN 0x00000002UL
		64	#define F_ALLOW_SHARING 0x00000004UL
		65	#define F_PACK_STRINGS 0x00000008UL
20		66
21	#define INIT_SIZE 32 // initial scalar size to be allocated	67	#define INIT_SIZE 32 // initial scalar size to be allocated
22		68
23	#define SB do {	69	#define SB do {
24	#define SE } while (0)	70	#define SE } while (0)
25
26	#if __GNUC__ >= 3
27	# define expect(expr,value) __builtin_expect ((expr), (value))
28	# define INLINE static inline
29	#else
30	# define expect(expr,value) (expr)
31	# define INLINE static
32	#endif
33
34	#define expect_false(expr) expect ((expr) != 0, 0)
35	#define expect_true(expr) expect ((expr) != 0, 1)
36		71
37	#define IN_RANGE_INC(type,val,beg,end) \	72	#define IN_RANGE_INC(type,val,beg,end) \
38	((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \	73	((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \
39	<= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))	74	<= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
40		75
…		…
46	#else	81	#else
47	# define CBOR_SLOW 0	82	# define CBOR_SLOW 0
48	# define CBOR_STASH cbor_stash	83	# define CBOR_STASH cbor_stash
49	#endif	84	#endif
50		85
51	static HV cbor_stash, cbor_boolean_stash; // CBOR::XS::	86	static HV cbor_stash, types_boolean_stash, types_error_stash, cbor_tagged_stash; // CBOR::XS::
52	static SV cbor_true, cbor_false;	87	static SV types_true, types_false, types_error, sv_cbor, *default_filter;
53		88
54	typedef struct {	89	typedef struct {
55	U32 flags;	90	U32 flags;
56	U32 max_depth;	91	U32 max_depth;
57	STRLEN max_size;	92	STRLEN max_size;
58		93	SV *filter;
59	SV *cb_object;
60	HV *cb_sk_object;
61	} CBOR;	94	} CBOR;
62		95
63	INLINE void	96	ecb_inline void
64	cbor_init (CBOR *cbor)	97	cbor_init (CBOR *cbor)
65	{	98	{
66	Zero (cbor, 1, CBOR);	99	Zero (cbor, 1, CBOR);
67	cbor->max_depth = 512;	100	cbor->max_depth = 512;
68	}	101	}
69		102
		103	ecb_inline void
		104	cbor_free (CBOR *cbor)
		105	{
		106	SvREFCNT_dec (cbor->filter);
		107	}
		108
70	/////////////////////////////////////////////////////////////////////////////	109	/////////////////////////////////////////////////////////////////////////////
71	// utility functions	110	// utility functions
72		111
73	INLINE SV *	112	ecb_inline SV *
74	get_bool (const char *name)	113	get_bool (const char *name)
75	{	114	{
76	SV *sv = get_sv (name, 1);	115	SV *sv = get_sv (name, 1);
77		116
78	SvREADONLY_on (sv);	117	SvREADONLY_on (sv);
79	SvREADONLY_on (SvRV (sv));	118	SvREADONLY_on (SvRV (sv));
80		119
81	return sv;	120	return sv;
82	}	121	}
83		122
84	INLINE void	123	ecb_inline void
85	shrink (SV *sv)	124	shrink (SV *sv)
86	{	125	{
87	sv_utf8_downgrade (sv, 1);	126	sv_utf8_downgrade (sv, 1);
88		127
89	if (SvLEN (sv) > SvCUR (sv) + 1)	128	if (SvLEN (sv) > SvCUR (sv) + 1)
…		…
94	SvPV_renew (sv, SvCUR (sv) + 1);	133	SvPV_renew (sv, SvCUR (sv) + 1);
95	#endif	134	#endif
96	}	135	}
97	}	136	}
98		137
99	/////////////////////////////////////////////////////////////////////////////	138	// minimum length of a string to be registered for stringref
100	// fp hell	139	ecb_inline int
101		140	minimum_string_length (UV idx)
102	//TODO	141	{
		142	return idx > 23
		143	? idx > 0xffU
		144	? idx > 0xffffU
		145	? idx > 0xffffffffU
		146	? 11
		147	: 7
		148	: 5
		149	: 4
		150	: 3;
		151	}
103		152
104	/////////////////////////////////////////////////////////////////////////////	153	/////////////////////////////////////////////////////////////////////////////
105	// encoder	154	// encoder
106		155
107	// structure used for encoding CBOR	156	// structure used for encoding CBOR
…		…
110	char *cur; // SvPVX (sv) + current output position	159	char *cur; // SvPVX (sv) + current output position
111	char *end; // SvEND (sv)	160	char *end; // SvEND (sv)
112	SV *sv; // result scalar	161	SV *sv; // result scalar
113	CBOR cbor;	162	CBOR cbor;
114	U32 depth; // recursion level	163	U32 depth; // recursion level
		164	HV *stringref[2]; // string => index, or 0 ([0] = bytes, [1] = utf-8)
		165	UV stringref_idx;
		166	HV *shareable; // ptr => index, or 0
		167	UV shareable_idx;
115	} enc_t;	168	} enc_t;
116		169
117	INLINE void	170	ecb_inline void
118	need (enc_t *enc, STRLEN len)	171	need (enc_t *enc, STRLEN len)
119	{	172	{
120	if (expect_false (enc->cur + len >= enc->end))	173	if (ecb_expect_false (enc->cur + len >= enc->end))
121	{	174	{
122	STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);	175	STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
123	SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);	176	SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
124	enc->cur = SvPVX (enc->sv) + cur;	177	enc->cur = SvPVX (enc->sv) + cur;
125	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;	178	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
126	}	179	}
127	}	180	}
128		181
129	INLINE void	182	ecb_inline void
130	encode_ch (enc_t *enc, char ch)	183	encode_ch (enc_t *enc, char ch)
131	{	184	{
132	need (enc, 1);	185	need (enc, 1);
133	*enc->cur++ = ch;	186	*enc->cur++ = ch;
134	}	187	}
…		…
136	static void	189	static void
137	encode_uint (enc_t *enc, int major, UV len)	190	encode_uint (enc_t *enc, int major, UV len)
138	{	191	{
139	need (enc, 9);	192	need (enc, 9);
140		193
141	if (len < 24)	194	if (ecb_expect_true (len < 24))
142	*enc->cur++ = major \| len;	195	*enc->cur++ = major \| len;
143	else if (len < 0x100)	196	else if (ecb_expect_true (len <= 0xff))
144	{	197	{
145	*enc->cur++ = major \| 24;	198	*enc->cur++ = major \| 24;
146	*enc->cur++ = len;	199	*enc->cur++ = len;
147	}	200	}
148	else if (len < 0x10000)	201	else if (len <= 0xffff)
149	{	202	{
150	*enc->cur++ = major \| 25;	203	*enc->cur++ = major \| 25;
151	*enc->cur++ = len >> 8;	204	*enc->cur++ = len >> 8;
152	*enc->cur++ = len;	205	*enc->cur++ = len;
153	}	206	}
154	else if (len < 0x100000000)	207	else if (len <= 0xffffffff)
155	{	208	{
156	*enc->cur++ = major \| 26;	209	*enc->cur++ = major \| 26;
157	*enc->cur++ = len >> 24;	210	*enc->cur++ = len >> 24;
158	*enc->cur++ = len >> 16;	211	*enc->cur++ = len >> 16;
159	*enc->cur++ = len >> 8;	212	*enc->cur++ = len >> 8;
160	*enc->cur++ = len;	213	*enc->cur++ = len;
161	}	214	}
162	else if (len)	215	else
163	{	216	{
164	*enc->cur++ = major \| 27;	217	*enc->cur++ = major \| 27;
165	*enc->cur++ = len >> 56;	218	*enc->cur++ = len >> 56;
166	*enc->cur++ = len >> 48;	219	*enc->cur++ = len >> 48;
167	*enc->cur++ = len >> 40;	220	*enc->cur++ = len >> 40;
…		…
171	*enc->cur++ = len >> 8;	224	*enc->cur++ = len >> 8;
172	*enc->cur++ = len;	225	*enc->cur++ = len;
173	}	226	}
174	}	227	}
175		228
176	static void	229	ecb_inline void
		230	encode_tag (enc_t *enc, UV tag)
		231	{
		232	encode_uint (enc, 0xc0, tag);
		233	}
		234
		235	ecb_inline void
177	encode_str (enc_t enc, int utf8, char str, STRLEN len)	236	encode_str (enc_t enc, int utf8, char str, STRLEN len)
178	{	237	{
179	encode_uint (enc, utf8 ? 0x60 : 0x40, len);	238	encode_uint (enc, utf8 ? 0x60 : 0x40, len);
180	need (enc, len);	239	need (enc, len);
181	memcpy (enc->cur, str, len);	240	memcpy (enc->cur, str, len);
182	enc->cur += len;	241	enc->cur += len;
183	}	242	}
184		243
		244	static void
		245	encode_strref (enc_t enc, int utf8, char str, STRLEN len)
		246	{
		247	if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS))
		248	{
		249	SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);
		250
		251	if (SvOK (*svp))
		252	{
		253	// already registered, use stringref
		254	encode_tag (enc, CBOR_TAG_STRINGREF);
		255	encode_uint (enc, 0x00, SvUV (*svp));
		256	return;
		257	}
		258	else if (len >= minimum_string_length (enc->stringref_idx))
		259	{
		260	// register only
		261	sv_setuv (*svp, enc->stringref_idx);
		262	++enc->stringref_idx;
		263	}
		264	}
		265
		266	encode_str (enc, utf8, str, len);
		267	}
		268
185	static void encode_sv (enc_t enc, SV sv);	269	static void encode_sv (enc_t enc, SV sv);
186		270
187	static void	271	static void
188	encode_av (enc_t enc, AV av)	272	encode_av (enc_t enc, AV av)
189	{	273	{
…		…
226	while ((he = hv_iternext (hv)))	310	while ((he = hv_iternext (hv)))
227	{	311	{
228	if (HeKLEN (he) == HEf_SVKEY)	312	if (HeKLEN (he) == HEf_SVKEY)
229	encode_sv (enc, HeSVKEY (he));	313	encode_sv (enc, HeSVKEY (he));
230	else	314	else
231	encode_str (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));	315	encode_strref (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));
232		316
233	encode_sv (enc, expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));	317	encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));
234	}	318	}
235		319
236	if (mg)	320	if (mg)
237	encode_ch (enc, 0xe0 \| 31);	321	encode_ch (enc, 0xe0 \| 31);
238		322
…		…
241		325
242	// encode objects, arrays and special \0=false and \1=true values.	326	// encode objects, arrays and special \0=false and \1=true values.
243	static void	327	static void
244	encode_rv (enc_t enc, SV sv)	328	encode_rv (enc_t enc, SV sv)
245	{	329	{
246	svtype svt;
247
248	SvGETMAGIC (sv);	330	SvGETMAGIC (sv);
		331
249	svt = SvTYPE (sv);	332	svtype svt = SvTYPE (sv);
250		333
251	if (expect_false (SvOBJECT (sv)))	334	if (ecb_expect_false (SvOBJECT (sv)))
252	{	335	{
253	HV *stash = !CBOR_SLOW \|\| cbor_boolean_stash	336	HV *boolean_stash = !CBOR_SLOW \|\| types_boolean_stash
254	? cbor_boolean_stash	337	? types_boolean_stash
		338	: gv_stashpv ("Types::Serialiser::Boolean", 1);
		339	HV *error_stash = !CBOR_SLOW \|\| types_error_stash
		340	? types_error_stash
		341	: gv_stashpv ("Types::Serialiser::Error", 1);
		342	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
		343	? cbor_tagged_stash
255	: gv_stashpv ("CBOR::XS::Boolean", 1);	344	: gv_stashpv ("CBOR::XS::Tagged" , 1);
256		345
257	if (SvSTASH (sv) == stash)	346	HV *stash = SvSTASH (sv);
		347	GV *method;
		348
		349	if (stash == boolean_stash)
258	encode_ch (enc, SvIV (sv) ? 0xe0 \| 21 : 0xe0 \| 20);	350	encode_ch (enc, SvIV (sv) ? 0xe0 \| 21 : 0xe0 \| 20);
		351	else if (stash == error_stash)
		352	encode_ch (enc, 0xe0 \| 23);
		353	else if (stash == tagged_stash)
		354	{
		355	if (svt != SVt_PVAV)
		356	croak ("encountered CBOR::XS::Tagged object that isn't an array");
		357
		358	encode_uint (enc, 0xc0, SvUV (av_fetch ((AV )sv, 0, 1)));
		359	encode_sv (enc, av_fetch ((AV )sv, 1, 1));
		360	}
		361	else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
		362	{
		363	dSP;
		364
		365	ENTER; SAVETMPS; PUSHMARK (SP);
		366	// we re-bless the reference to get overload and other niceties right
		367	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		368
		369	PUTBACK;
		370	// G_SCALAR ensures that return value is 1
		371	call_sv ((SV *)GvCV (method), G_SCALAR);
		372	SPAGAIN;
		373
		374	// catch this surprisingly common error
		375	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		376	croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (stash));
		377
		378	encode_sv (enc, POPs);
		379
		380	PUTBACK;
		381
		382	FREETMPS; LEAVE;
		383	}
		384	else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
		385	{
		386	dSP;
		387
		388	ENTER; SAVETMPS; PUSHMARK (SP);
		389	EXTEND (SP, 2);
		390	// we re-bless the reference to get overload and other niceties right
		391	PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		392	PUSHs (sv_cbor);
		393
		394	PUTBACK;
		395	int count = call_sv ((SV *)GvCV (method), G_ARRAY);
		396	SPAGAIN;
		397
		398	// catch this surprisingly common error
		399	if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
		400	croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
		401
		402	encode_tag (enc, CBOR_TAG_PERL_OBJECT);
		403	encode_uint (enc, 0x80, count + 1);
		404	encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
		405
		406	while (count)
		407	encode_sv (enc, SP[1 - count--]);
		408
		409	PUTBACK;
		410
		411	FREETMPS; LEAVE;
		412	}
259	else	413	else
260	{
261	#if 0 //TODO
262	if (enc->cbor.flags & F_CONV_BLESSED)
263	{
264	// we re-bless the reference to get overload and other niceties right
265	GV *to_cbor = gv_fetchmethod_autoload (SvSTASH (sv), "TO_CBOR", 0);
266
267	if (to_cbor)
268	{
269	dSP;
270
271	ENTER; SAVETMPS; PUSHMARK (SP);
272	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
273
274	// calling with G_SCALAR ensures that we always get a 1 return value
275	PUTBACK;
276	call_sv ((SV *)GvCV (to_cbor), G_SCALAR);
277	SPAGAIN;
278
279	// catch this surprisingly common error
280	if (SvROK (TOPs) && SvRV (TOPs) == sv)
281	croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
282
283	sv = POPs;
284	PUTBACK;
285
286	encode_sv (enc, sv);
287
288	FREETMPS; LEAVE;
289	}
290	else if (enc->cbor.flags & F_ALLOW_BLESSED)
291	encode_str (enc, "null", 4, 0);
292	else
293	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_CBOR method available on it",	414	croak ("encountered object '%s', but no TO_CBOR or FREEZE methods available on it",
294	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
295	}
296	else if (enc->cbor.flags & F_ALLOW_BLESSED)
297	encode_str (enc, "null", 4, 0);
298	else
299	croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",
300	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	415	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
301	#endif
302	}
303	}	416	}
304	else if (svt == SVt_PVHV)	417	else if (svt == SVt_PVHV)
305	encode_hv (enc, (HV *)sv);	418	encode_hv (enc, (HV *)sv);
306	else if (svt == SVt_PVAV)	419	else if (svt == SVt_PVAV)
307	encode_av (enc, (AV *)sv);	420	encode_av (enc, (AV *)sv);
308	else if (svt < SVt_PVAV)
309	{
310	STRLEN len = 0;
311	char *pv = svt ? SvPV (sv, len) : 0;
312
313	if (len == 1 && *pv == '1')
314	encode_ch (enc, 0xe0 \| 21);
315	else if (len == 1 && *pv == '0')
316	encode_ch (enc, 0xe0 \| 20);
317	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
318	encode_ch (enc, 0xe0 \| 23);
319	else
320	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
321	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
322	}
323	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
324	encode_ch (enc, 0xe0 \| 23);
325	else	421	else
326	croak ("encountered %s, but CBOR can only represent references to arrays or hashes",	422	{
327	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	423	if (ecb_expect_false (SvREFCNT (sv) > 1)
		424	&& ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING))
		425	{
		426	if (!enc->shareable)
		427	enc->shareable = (HV )sv_2mortal ((SV )newHV ());
		428
		429	SV *svp = hv_fetch (enc->shareable, (char )&sv, sizeof (sv), 1);
		430
		431	if (SvOK (*svp))
		432	{
		433	encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
		434	encode_uint (enc, 0x00, SvUV (*svp));
		435	return;
		436	}
		437	else
		438	{
		439	sv_setuv (*svp, enc->shareable_idx);
		440	++enc->shareable_idx;
		441	encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
		442	}
		443	}
		444
		445	encode_tag (enc, CBOR_TAG_INDIRECTION);
		446	encode_sv (enc, sv);
		447	}
328	}	448	}
329		449
330	static void	450	static void
331	encode_nv (enc_t enc, SV sv)	451	encode_nv (enc_t enc, SV sv)
332	{	452	{
333	double nv = SvNVX (sv);	453	double nv = SvNVX (sv);
334		454
335	need (enc, 9);	455	need (enc, 9);
336		456
337	if (expect_false (nv == (U32)nv))	457	if (ecb_expect_false (nv == (U32)nv))
338	encode_uint (enc, 0x00, (U32)nv);	458	encode_uint (enc, 0x00, (U32)nv);
339	//TODO: maybe I32?	459	//TODO: maybe I32?
340	else if (expect_false (nv == (float)nv))	460	else if (ecb_expect_false (nv == (float)nv))
341	{	461	{
342	uint32_t fp = ecb_float_to_binary32 (nv);	462	uint32_t fp = ecb_float_to_binary32 (nv);
343		463
344	*enc->cur++ = 0xe0 \| 26;	464	*enc->cur++ = 0xe0 \| 26;
345		465
…		…
370		490
371	if (SvPOKp (sv))	491	if (SvPOKp (sv))
372	{	492	{
373	STRLEN len;	493	STRLEN len;
374	char *str = SvPV (sv, len);	494	char *str = SvPV (sv, len);
375	encode_str (enc, SvUTF8 (sv), str, len);	495	encode_strref (enc, SvUTF8 (sv), str, len);
376	}	496	}
377	else if (SvNOKp (sv))	497	else if (SvNOKp (sv))
378	encode_nv (enc, sv);	498	encode_nv (enc, sv);
379	else if (SvIOKp (sv))	499	else if (SvIOKp (sv))
380	{	500	{
…		…
397	}	517	}
398		518
399	static SV *	519	static SV *
400	encode_cbor (SV scalar, CBOR cbor)	520	encode_cbor (SV scalar, CBOR cbor)
401	{	521	{
402	enc_t enc;	522	enc_t enc = { };
403		523
404	enc.cbor = *cbor;	524	enc.cbor = *cbor;
405	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	525	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
406	enc.cur = SvPVX (enc.sv);	526	enc.cur = SvPVX (enc.sv);
407	enc.end = SvEND (enc.sv);	527	enc.end = SvEND (enc.sv);
408	enc.depth = 0;
409		528
410	SvPOK_only (enc.sv);	529	SvPOK_only (enc.sv);
		530
		531	if (cbor->flags & F_PACK_STRINGS)
		532	{
		533	encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE);
		534	enc.stringref[0]= (HV )sv_2mortal ((SV )newHV ());
		535	enc.stringref[1]= (HV )sv_2mortal ((SV )newHV ());
		536	}
		537
411	encode_sv (&enc, scalar);	538	encode_sv (&enc, scalar);
412		539
413	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	540	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
414	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	541	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
415		542
…		…
429	U8 *end; // end of input string	556	U8 *end; // end of input string
430	const char *err; // parse error, if != 0	557	const char *err; // parse error, if != 0
431	CBOR cbor;	558	CBOR cbor;
432	U32 depth; // recursion depth	559	U32 depth; // recursion depth
433	U32 maxdepth; // recursion depth limit	560	U32 maxdepth; // recursion depth limit
		561	AV *shareable;
		562	AV *stringref;
		563	SV *decode_tagged;
434	} dec_t;	564	} dec_t;
435		565
436	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE	566	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE
437		567
438	#define WANT(len) if (expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data");	568	#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")
439		569
440	#define DEC_INC_DEPTH if (++dec->depth > dec->cbor.max_depth) ERR (ERR_NESTING_EXCEEDED)	570	#define DEC_INC_DEPTH if (++dec->depth > dec->cbor.max_depth) ERR (ERR_NESTING_EXCEEDED)
441	#define DEC_DEC_DEPTH --dec->depth	571	#define DEC_DEC_DEPTH --dec->depth
442		572
443	static UV	573	static UV
…		…
504		634
505	for (;;)	635	for (;;)
506	{	636	{
507	WANT (1);	637	WANT (1);
508		638
509	if (*dec->cur == 0xe0 \| 31)	639	if (*dec->cur == (0xe0 \| 31))
510	{	640	{
511	++dec->cur;	641	++dec->cur;
512	break;	642	break;
513	}	643	}
514		644
…		…
532	SvREFCNT_dec (av);	662	SvREFCNT_dec (av);
533	DEC_DEC_DEPTH;	663	DEC_DEC_DEPTH;
534	return &PL_sv_undef;	664	return &PL_sv_undef;
535	}	665	}
536		666
		667	static void
		668	decode_he (dec_t dec, HV hv)
		669	{
		670	// for speed reasons, we specialcase single-string
		671	// byte or utf-8 strings as keys, but only when !stringref
		672
		673	if (ecb_expect_true (!dec->stringref))
		674	if (dec->cur >= 0x40 && dec->cur <= 0x40 + 27)
		675	{
		676	I32 len = decode_uint (dec);
		677	char key = (char )dec->cur;
		678
		679	dec->cur += len;
		680
		681	if (ecb_expect_false (dec->stringref))
		682	av_push (dec->stringref, newSVpvn (key, len));
		683
		684	hv_store (hv, key, len, decode_sv (dec), 0);
		685
		686	return;
		687	}
		688	else if (dec->cur >= 0x60 && dec->cur <= 0x60 + 27)
		689	{
		690	I32 len = decode_uint (dec);
		691	char key = (char )dec->cur;
		692
		693	dec->cur += len;
		694
		695	if (ecb_expect_false (dec->stringref))
		696	av_push (dec->stringref, newSVpvn_utf8 (key, len, 1));
		697
		698	hv_store (hv, key, -len, decode_sv (dec), 0);
		699
		700	return;
		701	}
		702
		703	SV *k = decode_sv (dec);
		704	SV *v = decode_sv (dec);
		705
		706	hv_store_ent (hv, k, v, 0);
		707	SvREFCNT_dec (k);
		708	}
		709
537	static SV *	710	static SV *
538	decode_hv (dec_t *dec)	711	decode_hv (dec_t *dec)
539	{	712	{
540	HV *hv = newHV ();	713	HV *hv = newHV ();
541		714
…		…
547		720
548	for (;;)	721	for (;;)
549	{	722	{
550	WANT (1);	723	WANT (1);
551		724
552	if (*dec->cur == 0xe0 \| 31)	725	if (*dec->cur == (0xe0 \| 31))
553	{	726	{
554	++dec->cur;	727	++dec->cur;
555	break;	728	break;
556	}	729	}
557		730
558	SV *k = decode_sv (dec);	731	decode_he (dec, hv);
559	SV *v = decode_sv (dec);
560
561	hv_store_ent (hv, k, v, 0);
562	}	732	}
563	}	733	}
564	else	734	else
565	{	735	{
566	int len = decode_uint (dec);	736	int pairs = decode_uint (dec);
567		737
568	while (len--)	738	while (pairs--)
569	{	739	decode_he (dec, hv);
570	SV *k = decode_sv (dec);
571	SV *v = decode_sv (dec);
572
573	hv_store_ent (hv, k, v, 0);
574	}
575	}	740	}
576		741
577	DEC_DEC_DEPTH;	742	DEC_DEC_DEPTH;
578	return newRV_noinc ((SV *)hv);	743	return newRV_noinc ((SV *)hv);
579
580	#if 0
581	SV *sv;
582	HV *hv = newHV ();
583
584	DEC_INC_DEPTH;
585	decode_ws (dec);
586
587	for (;;)
588	{
589	// heuristic: assume that
590	// a) decode_str + hv_store_ent are abysmally slow.
591	// b) most hash keys are short, simple ascii text.
592	// => try to "fast-match" such strings to avoid
593	// the overhead of decode_str + hv_store_ent.
594	{
595	SV *value;
596	char *p = dec->cur;
597	char *e = p + 24; // only try up to 24 bytes
598
599	for (;;)
600	{
601	// the >= 0x80 is false on most architectures
602	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')
603	{
604	// slow path, back up and use decode_str
605	SV *key = decode_str (dec);
606	if (!key)
607	goto fail;
608
609	decode_ws (dec); EXPECT_CH (':');
610
611	decode_ws (dec);
612	value = decode_sv (dec);
613	if (!value)
614	{
615	SvREFCNT_dec (key);
616	goto fail;
617	}
618
619	hv_store_ent (hv, key, value, 0);
620	SvREFCNT_dec (key);
621
622	break;
623	}
624	else if (*p == '"')
625	{
626	// fast path, got a simple key
627	char *key = dec->cur;
628	int len = p - key;
629	dec->cur = p + 1;
630
631	decode_ws (dec); EXPECT_CH (':');
632
633	decode_ws (dec);
634	value = decode_sv (dec);
635	if (!value)
636	goto fail;
637
638	hv_store (hv, key, len, value, 0);
639
640	break;
641	}
642
643	++p;
644	}
645	}
646
647	decode_ws (dec);
648
649	if (*dec->cur == '}')
650	{
651	++dec->cur;
652	break;
653	}
654
655	if (*dec->cur != ',')
656	ERR (", or } expected while parsing object/hash");
657
658	++dec->cur;
659
660	decode_ws (dec);
661
662	if (*dec->cur == '}' && dec->cbor.flags & F_RELAXED)
663	{
664	++dec->cur;
665	break;
666	}
667	}
668
669	DEC_DEC_DEPTH;
670	sv = newRV_noinc ((SV *)hv);
671
672	// check filter callbacks
673	if (dec->cbor.flags & F_HOOK)
674	{
675	if (dec->cbor.cb_sk_object && HvKEYS (hv) == 1)
676	{
677	HE cb, he;
678
679	hv_iterinit (hv);
680	he = hv_iternext (hv);
681	hv_iterinit (hv);
682
683	// the next line creates a mortal sv each time its called.
684	// might want to optimise this for common cases.
685	cb = hv_fetch_ent (dec->cbor.cb_sk_object, hv_iterkeysv (he), 0, 0);
686
687	if (cb)
688	{
689	dSP;
690	int count;
691
692	ENTER; SAVETMPS; PUSHMARK (SP);
693	XPUSHs (HeVAL (he));
694	sv_2mortal (sv);
695
696	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
697
698	if (count == 1)
699	{
700	sv = newSVsv (POPs);
701	FREETMPS; LEAVE;
702	return sv;
703	}
704
705	SvREFCNT_inc (sv);
706	FREETMPS; LEAVE;
707	}
708	}
709
710	if (dec->cbor.cb_object)
711	{
712	dSP;
713	int count;
714
715	ENTER; SAVETMPS; PUSHMARK (SP);
716	XPUSHs (sv_2mortal (sv));
717
718	PUTBACK; count = call_sv (dec->cbor.cb_object, G_ARRAY); SPAGAIN;
719
720	if (count == 1)
721	{
722	sv = newSVsv (POPs);
723	FREETMPS; LEAVE;
724	return sv;
725	}
726
727	SvREFCNT_inc (sv);
728	FREETMPS; LEAVE;
729	}
730	}
731
732	return sv;
733	#endif
734		744
735	fail:	745	fail:
736	SvREFCNT_dec (hv);	746	SvREFCNT_dec (hv);
737	DEC_DEC_DEPTH;	747	DEC_DEC_DEPTH;
738	return &PL_sv_undef;	748	return &PL_sv_undef;
739	}	749	}
740		750
741	static SV *	751	static SV *
742	decode_str (dec_t *dec, int utf8)	752	decode_str (dec_t *dec, int utf8)
743	{	753	{
744	SV *sv;	754	SV *sv = 0;
745		755
746	if ((*dec->cur & 31) == 31)	756	if ((*dec->cur & 31) == 31)
747	{	757	{
		758	// indefinite length strings
748	++dec->cur;	759	++dec->cur;
749		760
		761	unsigned char major = *dec->cur & 0xe0;
		762
750	sv = newSVpvn ("", 0);	763	sv = newSVpvn ("", 0);
751		764
752	// not very fast, and certainly not robust against illegal input
753	for (;;)	765	for (;;)
754	{	766	{
755	WANT (1);	767	WANT (1);
756		768
		769	if ((*dec->cur ^ major) >= 31)
757	if (*dec->cur == 0xe0 \| 31)	770	if (*dec->cur == (0xe0 \| 31))
758	{	771	{
759	++dec->cur;	772	++dec->cur;
760	break;	773	break;
761	}	774	}
		775	else
		776	ERR ("corrupted CBOR data (invalid chunks in indefinite length string)");
762		777
763	SV *sv2 = decode_sv (dec);	778	STRLEN len = decode_uint (dec);
764	sv_catsv (sv, sv2);	779
		780	WANT (len);
		781	sv_catpvn (sv, dec->cur, len);
		782	dec->cur += len;
765	}	783	}
766	}	784	}
767	else	785	else
768	{	786	{
769	STRLEN len = decode_uint (dec);	787	STRLEN len = decode_uint (dec);
770		788
771	WANT (len);	789	WANT (len);
772	sv = newSVpvn (dec->cur, len);	790	sv = newSVpvn (dec->cur, len);
773	dec->cur += len;	791	dec->cur += len;
		792
		793	if (ecb_expect_false (dec->stringref)
		794	&& SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1))
		795	av_push (dec->stringref, SvREFCNT_inc_NN (sv));
774	}	796	}
775		797
776	if (utf8)	798	if (utf8)
777	SvUTF8_on (sv);	799	SvUTF8_on (sv);
778		800
779	return sv;	801	return sv;
780		802
781	fail:	803	fail:
		804	SvREFCNT_dec (sv);
		805	return &PL_sv_undef;
		806	}
		807
		808	static SV *
		809	decode_tagged (dec_t *dec)
		810	{
		811	SV *sv = 0;
		812	UV tag = decode_uint (dec);
		813
		814	WANT (1);
		815
		816	switch (tag)
		817	{
		818	case CBOR_TAG_MAGIC:
		819	sv = decode_sv (dec);
		820	break;
		821
		822	case CBOR_TAG_INDIRECTION:
		823	sv = newRV_noinc (decode_sv (dec));
		824	break;
		825
		826	case CBOR_TAG_STRINGREF_NAMESPACE:
		827	{
		828	ENTER; SAVETMPS;
		829
		830	SAVESPTR (dec->stringref);
		831	dec->stringref = (AV )sv_2mortal ((SV )newAV ());
		832
		833	sv = decode_sv (dec);
		834
		835	FREETMPS; LEAVE;
		836	}
		837	break;
		838
		839	case CBOR_TAG_STRINGREF:
		840	{
		841	if ((*dec->cur >> 5) != 0)
		842	ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
		843
		844	UV idx = decode_uint (dec);
		845
		846	if (!dec->stringref \|\| (int)idx > AvFILLp (dec->stringref))
		847	ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)");
		848
		849	sv = newSVsv (AvARRAY (dec->stringref)[idx]);
		850	}
		851	break;
		852
		853	case CBOR_TAG_VALUE_SHAREABLE:
		854	{
		855	if (ecb_expect_false (!dec->shareable))
		856	dec->shareable = (AV )sv_2mortal ((SV )newAV ());
		857
		858	sv = newSV (0);
		859	av_push (dec->shareable, SvREFCNT_inc_NN (sv));
		860
		861	SV *osv = decode_sv (dec);
		862	sv_setsv (sv, osv);
		863	SvREFCNT_dec_NN (osv);
		864	}
		865	break;
		866
		867	case CBOR_TAG_VALUE_SHAREDREF:
		868	{
		869	if ((*dec->cur >> 5) != 0)
		870	ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
		871
		872	UV idx = decode_uint (dec);
		873
		874	if (!dec->shareable \|\| (int)idx > AvFILLp (dec->shareable))
		875	ERR ("corrupted CBOR data (sharedref index out of bounds)");
		876
		877	sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
		878	}
		879	break;
		880
		881	case CBOR_TAG_PERL_OBJECT:
		882	{
		883	sv = decode_sv (dec);
		884
		885	if (!SvROK (sv) \|\| SvTYPE (SvRV (sv)) != SVt_PVAV)
		886	ERR ("corrupted CBOR data (non-array perl object)");
		887
		888	AV av = (AV )SvRV (sv);
		889	int len = av_len (av) + 1;
		890	HV stash = gv_stashsv (av_fetch (av, 0, 1), 0);
		891
		892	if (!stash)
		893	ERR ("cannot decode perl-object (package does not exist)");
		894
		895	GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
		896
		897	if (!method)
		898	ERR ("cannot decode perl-object (package does not have a THAW method)");
		899
		900	dSP;
		901
		902	ENTER; SAVETMPS; PUSHMARK (SP);
		903	EXTEND (SP, len + 1);
		904	// we re-bless the reference to get overload and other niceties right
		905	PUSHs (*av_fetch (av, 0, 1));
		906	PUSHs (sv_cbor);
		907
		908	int i;
		909
		910	for (i = 1; i < len; ++i)
		911	PUSHs (*av_fetch (av, i, 1));
		912
		913	PUTBACK;
		914	call_sv ((SV *)GvCV (method), G_SCALAR \| G_EVAL);
		915	SPAGAIN;
		916
		917	if (SvTRUE (ERRSV))
		918	{
		919	FREETMPS; LEAVE;
		920	ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
		921	}
		922
		923	SvREFCNT_dec (sv);
		924	sv = SvREFCNT_inc (POPs);
		925
		926	PUTBACK;
		927
		928	FREETMPS; LEAVE;
		929	}
		930	break;
		931
		932	default:
		933	{
		934	sv = decode_sv (dec);
		935
		936	dSP;
		937	ENTER; SAVETMPS; PUSHMARK (SP);
		938	EXTEND (SP, 2);
		939	PUSHs (newSVuv (tag));
		940	PUSHs (sv);
		941
		942	PUTBACK;
		943	int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY \| G_EVAL);
		944	SPAGAIN;
		945
		946	if (SvTRUE (ERRSV))
		947	{
		948	FREETMPS; LEAVE;
		949	ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
		950	}
		951
		952	if (count)
		953	{
		954	SvREFCNT_dec (sv);
		955	sv = SvREFCNT_inc (POPs);
		956	}
		957	else
		958	{
		959	AV *av = newAV ();
		960	av_push (av, newSVuv (tag));
		961	av_push (av, sv);
		962
		963	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
		964	? cbor_tagged_stash
		965	: gv_stashpv ("CBOR::XS::Tagged" , 1);
		966	sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash);
		967	}
		968
		969	PUTBACK;
		970
		971	FREETMPS; LEAVE;
		972	}
		973	break;
		974	}
		975
		976	return sv;
		977
		978	fail:
		979	SvREFCNT_dec (sv);
782	return &PL_sv_undef;	980	return &PL_sv_undef;
783	}	981	}
784		982
785	static SV *	983	static SV *
786	decode_sv (dec_t *dec)	984	decode_sv (dec_t *dec)
…		…
788	WANT (1);	986	WANT (1);
789		987
790	switch (*dec->cur >> 5)	988	switch (*dec->cur >> 5)
791	{	989	{
792	case 0: // unsigned int	990	case 0: // unsigned int
793	//TODO: 64 bit values on 3 2bit perls
794	return newSVuv (decode_uint (dec));	991	return newSVuv (decode_uint (dec));
795	case 1: // negative int	992	case 1: // negative int
796	return newSViv (-1 - (IV)decode_uint (dec));	993	return newSViv (-1 - (IV)decode_uint (dec));
797	case 2: // octet string	994	case 2: // octet string
798	return decode_str (dec, 0);	995	return decode_str (dec, 0);
…		…
801	case 4: // array	998	case 4: // array
802	return decode_av (dec);	999	return decode_av (dec);
803	case 5: // map	1000	case 5: // map
804	return decode_hv (dec);	1001	return decode_hv (dec);
805	case 6: // tag	1002	case 6: // tag
806	abort ();	1003	return decode_tagged (dec);
807	break;
808	case 7: // misc	1004	case 7: // misc
809	switch (*dec->cur++ & 31)	1005	switch (*dec->cur++ & 31)
810	{	1006	{
811	case 20:	1007	case 20:
812	#if CBOR_SLOW	1008	#if CBOR_SLOW
813	cbor_false = get_bool ("CBOR::XS::false");	1009	types_false = get_bool ("Types::Serialiser::false");
814	#endif	1010	#endif
815	return newSVsv (cbor_false);	1011	return newSVsv (types_false);
816	case 21:	1012	case 21:
817	#if CBOR_SLOW	1013	#if CBOR_SLOW
818	cbor_true = get_bool ("CBOR::XS::true");	1014	types_true = get_bool ("Types::Serialiser::true");
819	#endif	1015	#endif
820	return newSVsv (cbor_true);	1016	return newSVsv (types_true);
821	case 22:	1017	case 22:
822	return newSVsv (&PL_sv_undef);	1018	return newSVsv (&PL_sv_undef);
		1019	case 23:
		1020	#if CBOR_SLOW
		1021	types_error = get_bool ("Types::Serialiser::error");
		1022	#endif
		1023	return newSVsv (types_error);
823		1024
824	case 25:	1025	case 25:
825	// half float
826	abort ();
827	break;	1026	{
		1027	WANT (2);
		1028
		1029	uint16_t fp = (dec->cur[0] << 8) \| dec->cur[1];
		1030	dec->cur += 2;
		1031
		1032	return newSVnv (ecb_binary16_to_float (fp));
		1033	}
828		1034
829	case 26:	1035	case 26:
830	{	1036	{
831	uint32_t fp;	1037	uint32_t fp;
832	WANT (4);	1038	WANT (4);
…		…
858	ERR ("corrupted CBOR data (reserved/unassigned major 7 value)");	1064	ERR ("corrupted CBOR data (reserved/unassigned major 7 value)");
859	}	1065	}
860		1066
861	break;	1067	break;
862	}	1068	}
863	#if 0
864	switch (*dec->cur)
865	{
866	//case '"': ++dec->cur; return decode_str (dec);
867	case '[': ++dec->cur; return decode_av (dec);
868	case '{': ++dec->cur; return decode_hv (dec);
869
870	case '-':
871	case '0': case '1': case '2': case '3': case '4':
872	case '5': case '6': case '7': case '8': case '9':
873	//TODO return decode_num (dec);
874
875	case 't':
876	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
877	{
878	dec->cur += 4;
879	#if CBOR_SLOW
880	cbor_true = get_bool ("CBOR::XS::true");
881	#endif
882	return newSVsv (cbor_true);
883	}
884	else
885	ERR ("'true' expected");
886
887	break;
888
889	case 'f':
890	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
891	{
892	dec->cur += 5;
893	#if CBOR_SLOW
894	cbor_false = get_bool ("CBOR::XS::false");
895	#endif
896	return newSVsv (cbor_false);
897	}
898	else
899	ERR ("'false' expected");
900
901	break;
902
903	case 'n':
904	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4))
905	{
906	dec->cur += 4;
907	return newSVsv (&PL_sv_undef);
908	}
909	else
910	ERR ("'null' expected");
911
912	break;
913
914	default:
915	ERR ("malformed CBOR string, neither array, object, number, string or atom");
916	break;
917	}
918	#endif
919		1069
920	fail:	1070	fail:
921	return &PL_sv_undef;	1071	return &PL_sv_undef;
922	}	1072	}
923		1073
924	static SV *	1074	static SV *
925	decode_cbor (SV string, CBOR cbor, char **offset_return)	1075	decode_cbor (SV string, CBOR cbor, char **offset_return)
926	{	1076	{
927	dec_t dec;	1077	dec_t dec = { };
928	SV *sv;	1078	SV *sv;
		1079	STRLEN len;
		1080	char *data = SvPVbyte (string, len);
929		1081
930	/* work around bugs in 5.10 where manipulating magic values
931	* makes perl ignore the magic in subsequent accesses.
932	* also make a copy of non-PV values, to get them into a clean
933	* state (SvPV should do that, but it's buggy, see below).
934	*/
935	/SvGETMAGIC (string);/
936	if (SvMAGICAL (string) \|\| !SvPOK (string))
937	string = sv_2mortal (newSVsv (string));
938
939	SvUPGRADE (string, SVt_PV);
940
941	/* work around a bug in perl 5.10, which causes SvCUR to fail an
942	* assertion with -DDEBUGGING, although SvCUR is documented to
943	* return the xpv_cur field which certainly exists after upgrading.
944	* according to nicholas clark, calling SvPOK fixes this.
945	* But it doesn't fix it, so try another workaround, call SvPV_nolen
946	* and hope for the best.
947	* Damnit, SvPV_nolen still trips over yet another assertion. This
948	* assertion business is seriously broken, try yet another workaround
949	* for the broken -DDEBUGGING.
950	*/
951	{
952	#ifdef DEBUGGING
953	STRLEN offset = SvOK (string) ? sv_len (string) : 0;
954	#else
955	STRLEN offset = SvCUR (string);
956	#endif
957
958	if (offset > cbor->max_size && cbor->max_size)	1082	if (len > cbor->max_size && cbor->max_size)
959	croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",	1083	croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",
960	(unsigned long)SvCUR (string), (unsigned long)cbor->max_size);	1084	(unsigned long)len, (unsigned long)cbor->max_size);
961	}
962
963	sv_utf8_downgrade (string, 0);
964		1085
965	dec.cbor = *cbor;	1086	dec.cbor = *cbor;
966	dec.cur = (U8 *)SvPVX (string);	1087	dec.cur = (U8 *)data;
967	dec.end = (U8 *)SvEND (string);	1088	dec.end = (U8 *)data + len;
968	dec.err = 0;
969	dec.depth = 0;
970
971	if (dec.cbor.cb_object \|\| dec.cbor.cb_sk_object)
972	;//TODO dec.cbor.flags \|= F_HOOK;
973		1089
974	sv = decode_sv (&dec);	1090	sv = decode_sv (&dec);
975		1091
976	if (offset_return)	1092	if (offset_return)
977	*offset_return = dec.cur;	1093	*offset_return = dec.cur;
978		1094
979	if (!(offset_return \|\| !sv))	1095	if (!(offset_return \|\| !sv))
980	{
981	if (*dec.cur && !dec.err)	1096	if (dec.cur != dec.end && !dec.err)
982	{
983	dec.err = "garbage after CBOR object";	1097	dec.err = "garbage after CBOR object";
		1098
		1099	if (dec.err)
		1100	{
984	SvREFCNT_dec (sv);	1101	SvREFCNT_dec (sv);
985	sv = 0;
986	}
987	}
988
989	if (!sv)
990	croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 )SvPVX (string), (int)(uint8_t)dec.cur);	1102	croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 )data, (int)(uint8_t)dec.cur);
		1103	}
991		1104
992	sv = sv_2mortal (sv);	1105	sv = sv_2mortal (sv);
993		1106
994	return sv;	1107	return sv;
995	}	1108	}
…		…
1000	MODULE = CBOR::XS PACKAGE = CBOR::XS	1113	MODULE = CBOR::XS PACKAGE = CBOR::XS
1001		1114
1002	BOOT:	1115	BOOT:
1003	{	1116	{
1004	cbor_stash = gv_stashpv ("CBOR::XS" , 1);	1117	cbor_stash = gv_stashpv ("CBOR::XS" , 1);
1005	cbor_boolean_stash = gv_stashpv ("CBOR::XS::Boolean", 1);	1118	cbor_tagged_stash = gv_stashpv ("CBOR::XS::Tagged" , 1);
1006		1119
1007	cbor_true = get_bool ("CBOR::XS::true");	1120	types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1008	cbor_false = get_bool ("CBOR::XS::false");	1121	types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);
		1122
		1123	types_true = get_bool ("Types::Serialiser::true" );
		1124	types_false = get_bool ("Types::Serialiser::false");
		1125	types_error = get_bool ("Types::Serialiser::error");
		1126
		1127	default_filter = newSVpv ("CBOR::XS::default_filter", 0);
		1128
		1129	sv_cbor = newSVpv ("CBOR", 0);
		1130	SvREADONLY_on (sv_cbor);
1009	}	1131	}
1010		1132
1011	PROTOTYPES: DISABLE	1133	PROTOTYPES: DISABLE
1012		1134
1013	void CLONE (...)	1135	void CLONE (...)
1014	CODE:	1136	CODE:
1015	cbor_stash = 0;	1137	cbor_stash = 0;
		1138	cbor_tagged_stash = 0;
		1139	types_error_stash = 0;
1016	cbor_boolean_stash = 0;	1140	types_boolean_stash = 0;
1017		1141
1018	void new (char *klass)	1142	void new (char *klass)
1019	PPCODE:	1143	PPCODE:
1020	{	1144	{
1021	SV *pv = NEWSV (0, sizeof (CBOR));	1145	SV *pv = NEWSV (0, sizeof (CBOR));
…		…
1029		1153
1030	void shrink (CBOR *self, int enable = 1)	1154	void shrink (CBOR *self, int enable = 1)
1031	ALIAS:	1155	ALIAS:
1032	shrink = F_SHRINK	1156	shrink = F_SHRINK
1033	allow_unknown = F_ALLOW_UNKNOWN	1157	allow_unknown = F_ALLOW_UNKNOWN
		1158	allow_sharing = F_ALLOW_SHARING
		1159	pack_strings = F_PACK_STRINGS
1034	PPCODE:	1160	PPCODE:
1035	{	1161	{
1036	if (enable)	1162	if (enable)
1037	self->flags \|= ix;	1163	self->flags \|= ix;
1038	else	1164	else
…		…
1043		1169
1044	void get_shrink (CBOR *self)	1170	void get_shrink (CBOR *self)
1045	ALIAS:	1171	ALIAS:
1046	get_shrink = F_SHRINK	1172	get_shrink = F_SHRINK
1047	get_allow_unknown = F_ALLOW_UNKNOWN	1173	get_allow_unknown = F_ALLOW_UNKNOWN
		1174	get_allow_sharing = F_ALLOW_SHARING
		1175	get_pack_strings = F_PACK_STRINGS
1048	PPCODE:	1176	PPCODE:
1049	XPUSHs (boolSV (self->flags & ix));	1177	XPUSHs (boolSV (self->flags & ix));
1050		1178
1051	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)	1179	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
1052	PPCODE:	1180	PPCODE:
…		…
1068	CODE:	1196	CODE:
1069	RETVAL = self->max_size;	1197	RETVAL = self->max_size;
1070	OUTPUT:	1198	OUTPUT:
1071	RETVAL	1199	RETVAL
1072		1200
1073	#if 0 //TODO	1201	void filter (CBOR self, SV filter = 0)
1074
1075	void filter_cbor_object (CBOR self, SV cb = &PL_sv_undef)
1076	PPCODE:	1202	PPCODE:
1077	{
1078	SvREFCNT_dec (self->cb_object);	1203	SvREFCNT_dec (self->filter);
1079	self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;	1204	self->filter = filter ? newSVsv (filter) : filter;
1080
1081	XPUSHs (ST (0));	1205	XPUSHs (ST (0));
1082	}
1083		1206
1084	void filter_cbor_single_key_object (CBOR self, SV key, SV *cb = &PL_sv_undef)	1207	SV get_filter (CBOR self)
1085	PPCODE:	1208	CODE:
1086	{	1209	RETVAL = self->filter ? self->filter : NEWSV (0, 0);
1087	if (!self->cb_sk_object)	1210	OUTPUT:
1088	self->cb_sk_object = newHV ();	1211	RETVAL
1089
1090	if (SvOK (cb))
1091	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1092	else
1093	{
1094	hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
1095
1096	if (!HvKEYS (self->cb_sk_object))
1097	{
1098	SvREFCNT_dec (self->cb_sk_object);
1099	self->cb_sk_object = 0;
1100	}
1101	}
1102
1103	XPUSHs (ST (0));
1104	}
1105
1106	#endif
1107		1212
1108	void encode (CBOR self, SV scalar)	1213	void encode (CBOR self, SV scalar)
1109	PPCODE:	1214	PPCODE:
1110	PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;	1215	PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;
1111	XPUSHs (scalar);	1216	XPUSHs (scalar);
…		…
1125	PUSHs (sv);	1230	PUSHs (sv);
1126	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));	1231	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1127	}	1232	}
1128		1233
1129	void DESTROY (CBOR *self)	1234	void DESTROY (CBOR *self)
1130	CODE:	1235	PPCODE:
1131	SvREFCNT_dec (self->cb_sk_object);	1236	cbor_free (self);
1132	SvREFCNT_dec (self->cb_object);
1133		1237
1134	PROTOTYPES: ENABLE	1238	PROTOTYPES: ENABLE
1135		1239
1136	void encode_cbor (SV *scalar)	1240	void encode_cbor (SV *scalar)
1137	PPCODE:	1241	PPCODE:

Diff Legend

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

Comparing CBOR-XS/XS.xs (file contents): Revision 1.1 by root, Fri Oct 25 23:09:45 2013 UTC vs. Revision 1.33 by root, Sat Nov 30 15:23:59 2013 UTC

Diff Legend

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.1 by root, Fri Oct 25 23:09:45 2013 UTC vs.
Revision 1.33 by root, Sat Nov 30 15:23:59 2013 UTC