ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/CBOR-XS/XS.xs
(Generate patch)

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

Diff Legend

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