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.44 by root, Tue Feb 18 22:12:12 2014 UTC vs.
Revision 1.72 by root, Thu Oct 21 01:14:58 2021 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
12#define ECB_NO_THREADS 1 13#define ECB_NO_THREADS 1
13#include "ecb.h" 14#include "ecb.h"
14 15
15// compatibility with perl <5.18 16// compatibility with perl <5.18
… …
20# define HvNAMELEN(hv) HvNAMELEN_get (hv) 21# define HvNAMELEN(hv) HvNAMELEN_get (hv)
21#endif 22#endif
22#ifndef HvNAMEUTF8 23#ifndef HvNAMEUTF8
23# define HvNAMEUTF8(hv) 0 24# define HvNAMEUTF8(hv) 0
24#endif 25#endif
26#ifndef SvREFCNT_inc_NN
27# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
28#endif
25#ifndef SvREFCNT_dec_NN 29#ifndef SvREFCNT_dec_NN
26# define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv) 30# define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
27#endif 31#endif
32
33// perl's is_utf8_string interprets len=0 as "calculate len", but we want it to mean 0
34#define cbor_is_utf8_string(str,len) (!(len) || is_utf8_string ((str), (len)))
28 35
29// known major and minor types 36// known major and minor types
30enum cbor_type 37enum cbor_type
31{ 38{
32 MAJOR_SHIFT = 5, 39 MAJOR_SHIFT = 5,
… …
95 CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8 102 CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
96 103
97 CBOR_TAG_MAGIC = 55799, // self-describe cbor 104 CBOR_TAG_MAGIC = 55799, // self-describe cbor
98}; 105};
99 106
107// known forced types, also hardcoded in CBOR.pm
108enum
109{
110 AS_CBOR = 0,
111 AS_INT = 1,
112 AS_BYTES = 2,
113 AS_TEXT = 3,
114 AS_FLOAT16 = 4,
115 AS_FLOAT32 = 5,
116 AS_FLOAT64 = 6,
117 AS_MAP = 7,
118 // possibly future enhancements: (generic) float, (generic) string
119};
120
100#define F_SHRINK 0x00000001UL 121#define F_SHRINK 0x00000001UL
101#define F_ALLOW_UNKNOWN 0x00000002UL 122#define F_ALLOW_UNKNOWN 0x00000002UL
102#define F_ALLOW_SHARING 0x00000004UL 123#define F_ALLOW_SHARING 0x00000004UL
103#define F_ALLOW_CYCLES 0x00000008UL 124#define F_ALLOW_CYCLES 0x00000008UL
125#define F_FORBID_OBJECTS 0x00000010UL
104#define F_PACK_STRINGS 0x00000010UL 126#define F_PACK_STRINGS 0x00000020UL
127#define F_TEXT_KEYS 0x00000040UL
128#define F_TEXT_STRINGS 0x00000080UL
105#define F_VALIDATE_UTF8 0x00000020UL 129#define F_VALIDATE_UTF8 0x00000100UL
106 130
107#define INIT_SIZE 32 // initial scalar size to be allocated 131#define INIT_SIZE 32 // initial scalar size to be allocated
108 132
109#define SB do { 133#define SB do {
110#define SE } while (0) 134#define SE } while (0)
… …
180#endif 204#endif
181 } 205 }
182} 206}
183 207
184// minimum length of a string to be registered for stringref 208// minimum length of a string to be registered for stringref
185ecb_inline int 209ecb_inline STRLEN
186minimum_string_length (UV idx) 210minimum_string_length (UV idx)
187{ 211{
188 return idx > 23 212 return idx <= 23 ? 3
189 ? idx > 0xffU 213 : idx <= 0xffU ? 4
190 ? idx > 0xffffU 214 : idx <= 0xffffU ? 5
191 ? idx > 0xffffffffU 215 : idx <= 0xffffffffU ? 7
192 ? 11 216 : 11;
193 : 7
194 : 5
195 : 4
196 : 3;
197} 217}
198 218
199///////////////////////////////////////////////////////////////////////////// 219/////////////////////////////////////////////////////////////////////////////
200// encoder 220// encoder
201 221
… …
214} enc_t; 234} enc_t;
215 235
216ecb_inline void 236ecb_inline void
217need (enc_t *enc, STRLEN len) 237need (enc_t *enc, STRLEN len)
218{ 238{
219 if (ecb_expect_false (enc->cur + len >= enc->end)) 239 if (ecb_expect_false ((uintptr_t)(enc->end - enc->cur) < len))
220 { 240 {
221 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 241 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
222 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 242 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
223 enc->cur = SvPVX (enc->sv) + cur; 243 enc->cur = SvPVX (enc->sv) + cur;
224 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 244 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
225 } 245 }
226} 246}
227 247
248static void encode_sv (enc_t *enc, SV *sv);
249
228ecb_inline void 250ecb_inline void
229encode_ch (enc_t *enc, char ch) 251encode_ch (enc_t *enc, char ch)
230{ 252{
231 need (enc, 1); 253 need (enc, 1);
232 *enc->cur++ = ch; 254 *enc->cur++ = ch;
233} 255}
234 256
257// used for tags, intregers, element counts and so on
235static void 258static void
236encode_uint (enc_t *enc, int major, UV len) 259encode_uint (enc_t *enc, int major, UV len)
237{ 260{
238 need (enc, 9); 261 need (enc, 9);
239 262
… …
270 *enc->cur++ = len >> 8; 293 *enc->cur++ = len >> 8;
271 *enc->cur++ = len; 294 *enc->cur++ = len;
272 } 295 }
273} 296}
274 297
298// encodes a perl value into a CBOR integer
299ecb_inline void
300encode_int (enc_t *enc, SV *sv)
301{
302 if (SvIsUV (sv))
303 encode_uint (enc, MAJOR_POS_INT, SvUVX (sv));
304 else if (SvIVX (sv) >= 0)
305 encode_uint (enc, MAJOR_POS_INT, SvIVX (sv));
306 else
307 encode_uint (enc, MAJOR_NEG_INT, -(SvIVX (sv) + 1));
308}
309
275ecb_inline void 310ecb_inline void
276encode_tag (enc_t *enc, UV tag) 311encode_tag (enc_t *enc, UV tag)
277{ 312{
278 encode_uint (enc, MAJOR_TAG, tag); 313 encode_uint (enc, MAJOR_TAG, tag);
279} 314}
280 315
316// exceptional (hopefully) slow path for byte strings that need to be utf8-encoded
317ecb_noinline static void
318encode_str_utf8 (enc_t *enc, int utf8, char *str, STRLEN len)
319{
320 STRLEN ulen = len;
321 U8 *p, *pend = (U8 *)str + len;
322
323 for (p = (U8 *)str; p < pend; ++p)
324 ulen += *p >> 7; // count set high bits
325
326 encode_uint (enc, MAJOR_TEXT, ulen);
327
328 need (enc, ulen);
329 for (p = (U8 *)str; p < pend; ++p)
330 if (*p < 0x80)
331 *enc->cur++ = *p;
332 else
333 {
334 *enc->cur++ = 0xc0 + (*p >> 6);
335 *enc->cur++ = 0x80 + (*p & 63);
336 }
337}
338
281ecb_inline void 339ecb_inline void
282encode_str (enc_t *enc, int utf8, char *str, STRLEN len) 340encode_str (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len)
283{ 341{
342 if (ecb_expect_false (upgrade_utf8))
343 if (!utf8)
344 {
345 encode_str_utf8 (enc, utf8, str, len);
346 return;
347 }
348
284 encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len); 349 encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len);
285 need (enc, len); 350 need (enc, len);
286 memcpy (enc->cur, str, len); 351 memcpy (enc->cur, str, len);
287 enc->cur += len; 352 enc->cur += len;
288} 353}
289 354
290static void 355ecb_inline void
291encode_strref (enc_t *enc, int utf8, char *str, STRLEN len) 356encode_strref (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len)
292{ 357{
293 if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS)) 358 if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS))
294 { 359 {
295 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1); 360 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);
296 361
… …
307 sv_setuv (*svp, enc->stringref_idx); 372 sv_setuv (*svp, enc->stringref_idx);
308 ++enc->stringref_idx; 373 ++enc->stringref_idx;
309 } 374 }
310 } 375 }
311 376
312 encode_str (enc, utf8, str, len); 377 encode_str (enc, upgrade_utf8, utf8, str, len);
313} 378}
314 379
315static void encode_sv (enc_t *enc, SV *sv); 380ecb_inline void
381encode_float16 (enc_t *enc, NV nv)
382{
383 need (enc, 1+2);
384
385 *enc->cur++ = MAJOR_MISC | MISC_FLOAT16;
386
387 uint16_t fp = ecb_float_to_binary16 (nv);
388
389 if (!ecb_big_endian ())
390 fp = ecb_bswap16 (fp);
391
392 memcpy (enc->cur, &fp, 2);
393 enc->cur += 2;
394}
395
396ecb_inline void
397encode_float32 (enc_t *enc, NV nv)
398{
399 need (enc, 1+4);
400
401 *enc->cur++ = MAJOR_MISC | MISC_FLOAT32;
402
403 uint32_t fp = ecb_float_to_binary32 (nv);
404
405 if (!ecb_big_endian ())
406 fp = ecb_bswap32 (fp);
407
408 memcpy (enc->cur, &fp, 4);
409 enc->cur += 4;
410}
411
412ecb_inline void
413encode_float64 (enc_t *enc, NV nv)
414{
415 need (enc, 1+8);
416
417 *enc->cur++ = MAJOR_MISC | MISC_FLOAT64;
418
419 uint64_t fp = ecb_double_to_binary64 (nv);
420
421 if (!ecb_big_endian ())
422 fp = ecb_bswap64 (fp);
423
424 memcpy (enc->cur, &fp, 8);
425 enc->cur += 8;
426}
427
428ecb_inline void
429encode_bool (enc_t *enc, int istrue)
430{
431 encode_ch (enc, istrue ? MAJOR_MISC | SIMPLE_TRUE : MAJOR_MISC | SIMPLE_FALSE);
432}
433
434// encodes an arrayref containing key-value pairs as CBOR map
435ecb_inline void
436encode_array_as_map (enc_t *enc, SV *sv)
437{
438 if (enc->depth >= enc->cbor.max_depth)
439 croak (ERR_NESTING_EXCEEDED);
440
441 ++enc->depth;
442
443 // as_map does error checking for us, but we re-check in case
444 // things have changed.
445
446 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
447 croak ("CBOR::XS::as_map requires an array reference (did you change the array after calling as_map?)");
448
449 AV *av = (AV *)SvRV (sv);
450 int i, len = av_len (av);
451
452 if (!(len & 1))
453 croak ("CBOR::XS::as_map requires an even number of elements (did you change the array after calling as_map?)");
454
455 encode_uint (enc, MAJOR_MAP, (len + 1) >> 1);
456
457 for (i = 0; i <= len; ++i)
458 {
459 SV **svp = av_fetch (av, i, 0);
460 encode_sv (enc, svp ? *svp : &PL_sv_undef);
461 }
462
463 --enc->depth;
464}
465
466ecb_inline void
467encode_forced (enc_t *enc, UV type, SV *sv)
468{
469 switch (type)
470 {
471 case AS_CBOR:
472 {
473 STRLEN len;
474 char *str = SvPVbyte (sv, len);
475
476 need (enc, len);
477 memcpy (enc->cur, str, len);
478 enc->cur += len;
479 }
480 break;
481
482 case AS_BYTES:
483 {
484 STRLEN len;
485 char *str = SvPVbyte (sv, len);
486 encode_strref (enc, 0, 0, str, len);
487 }
488 break;
489
490 case AS_TEXT:
491 {
492 STRLEN len;
493 char *str = SvPVutf8 (sv, len);
494 encode_strref (enc, 1, 1, str, len);
495 }
496 break;
497
498 case AS_INT: encode_int (enc, sv); break;
499
500 case AS_FLOAT16: encode_float16 (enc, SvNV (sv)); break;
501 case AS_FLOAT32: encode_float32 (enc, SvNV (sv)); break;
502 case AS_FLOAT64: encode_float64 (enc, SvNV (sv)); break;
503
504 case AS_MAP: encode_array_as_map (enc, sv); break;
505
506 default:
507 croak ("encountered malformed CBOR::XS::Tagged object");
508 }
509}
316 510
317static void 511static void
318encode_av (enc_t *enc, AV *av) 512encode_av (enc_t *enc, AV *av)
319{ 513{
320 int i, len = av_len (av); 514 int i, len = av_len (av);
… …
324 518
325 ++enc->depth; 519 ++enc->depth;
326 520
327 encode_uint (enc, MAJOR_ARRAY, len + 1); 521 encode_uint (enc, MAJOR_ARRAY, len + 1);
328 522
523 if (ecb_expect_false (SvMAGICAL (av)))
329 for (i = 0; i <= len; ++i) 524 for (i = 0; i <= len; ++i)
330 { 525 {
331 SV **svp = av_fetch (av, i, 0); 526 SV **svp = av_fetch (av, i, 0);
332 encode_sv (enc, svp ? *svp : &PL_sv_undef); 527 encode_sv (enc, svp ? *svp : &PL_sv_undef);
333 } 528 }
529 else
530 for (i = 0; i <= len; ++i)
531 {
532 SV *sv = AvARRAY (av)[i];
533 encode_sv (enc, sv ? sv : &PL_sv_undef);
534 }
334 535
335 --enc->depth; 536 --enc->depth;
336} 537}
337 538
338static void 539static void
… …
346 ++enc->depth; 547 ++enc->depth;
347 548
348 int pairs = hv_iterinit (hv); 549 int pairs = hv_iterinit (hv);
349 int mg = SvMAGICAL (hv); 550 int mg = SvMAGICAL (hv);
350 551
351 if (mg) 552 if (ecb_expect_false (mg))
352 encode_ch (enc, MAJOR_MAP | MINOR_INDEF); 553 encode_ch (enc, MAJOR_MAP | MINOR_INDEF);
353 else 554 else
354 encode_uint (enc, MAJOR_MAP, pairs); 555 encode_uint (enc, MAJOR_MAP, pairs);
355 556
356 while ((he = hv_iternext (hv))) 557 while ((he = hv_iternext (hv)))
357 { 558 {
358 if (HeKLEN (he) == HEf_SVKEY) 559 if (HeKLEN (he) == HEf_SVKEY)
359 encode_sv (enc, HeSVKEY (he)); 560 encode_sv (enc, HeSVKEY (he));
360 else 561 else
361 encode_strref (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he)); 562 encode_strref (enc, enc->cbor.flags & (F_TEXT_KEYS | F_TEXT_STRINGS), HeKUTF8 (he), HeKEY (he), HeKLEN (he));
362 563
363 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he)); 564 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));
364 } 565 }
365 566
366 if (mg) 567 if (ecb_expect_false (mg))
367 encode_ch (enc, MAJOR_MISC | MINOR_INDEF); 568 encode_ch (enc, MAJOR_MISC | MINOR_INDEF);
368 569
369 --enc->depth; 570 --enc->depth;
370} 571}
371 572
… …
391 592
392 HV *stash = SvSTASH (sv); 593 HV *stash = SvSTASH (sv);
393 594
394 if (stash == boolean_stash) 595 if (stash == boolean_stash)
395 { 596 {
396 encode_ch (enc, SvIV (sv) ? MAJOR_MISC | SIMPLE_TRUE : MAJOR_MISC | SIMPLE_FALSE); 597 encode_bool (enc, SvIV (sv));
397 return; 598 return;
398 } 599 }
399 else if (stash == error_stash) 600 else if (stash == error_stash)
400 { 601 {
401 encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF); 602 encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF);
… …
404 else if (stash == tagged_stash) 605 else if (stash == tagged_stash)
405 { 606 {
406 if (svt != SVt_PVAV) 607 if (svt != SVt_PVAV)
407 croak ("encountered CBOR::XS::Tagged object that isn't an array"); 608 croak ("encountered CBOR::XS::Tagged object that isn't an array");
408 609
610 switch (av_len ((AV *)sv))
611 {
612 case 2-1:
613 // actually a tagged value
409 encode_uint (enc, MAJOR_TAG, SvUV (*av_fetch ((AV *)sv, 0, 1))); 614 encode_uint (enc, MAJOR_TAG, SvUV (*av_fetch ((AV *)sv, 0, 1)));
410 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1)); 615 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1));
616 break;
617
618 case 3-1:
619 // a forced type [value, type, undef]
620 encode_forced (enc, SvUV (*av_fetch ((AV *)sv, 1, 1)), *av_fetch ((AV *)sv, 0, 1));
621 break;
622
623 default:
624 croak ("encountered malformed CBOR::XS::Tagged object");
625 }
411 626
412 return; 627 return;
413 } 628 }
414 } 629 }
415 630
416 if (ecb_expect_false (SvREFCNT (sv) > 1) 631 if (ecb_expect_false (SvREFCNT (sv) > 1)
417 && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)) 632 && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING))
418 { 633 {
419 if (!enc->shareable) 634 if (ecb_expect_false (!enc->shareable))
420 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ()); 635 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ());
421 636
422 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1); 637 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1);
423 638
424 if (SvOK (*svp)) 639 if (SvOK (*svp))
… …
438 if (ecb_expect_false (SvOBJECT (sv))) 653 if (ecb_expect_false (SvOBJECT (sv)))
439 { 654 {
440 HV *stash = SvSTASH (sv); 655 HV *stash = SvSTASH (sv);
441 GV *method; 656 GV *method;
442 657
658 if (enc->cbor.flags & F_FORBID_OBJECTS)
659 croak ("encountered object '%s', but forbid_objects is enabled",
660 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
443 if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0))) 661 else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
444 { 662 {
445 dSP; 663 dSP;
446 664
447 ENTER; SAVETMPS; PUSHMARK (SP); 665 ENTER; SAVETMPS;
666 PUSHMARK (SP);
448 // we re-bless the reference to get overload and other niceties right 667 // we re-bless the reference to get overload and other niceties right
449 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 668 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
450 669
451 PUTBACK; 670 PUTBACK;
452 // G_SCALAR ensures that return value is 1 671 // G_SCALAR ensures that return value is 1
… …
465 } 684 }
466 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0) 685 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
467 { 686 {
468 dSP; 687 dSP;
469 688
470 ENTER; SAVETMPS; PUSHMARK (SP); 689 ENTER; SAVETMPS;
690 PUSHMARK (SP);
471 EXTEND (SP, 2); 691 EXTEND (SP, 2);
472 // we re-bless the reference to get overload and other niceties right 692 // we re-bless the reference to get overload and other niceties right
473 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 693 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
474 PUSHs (sv_cbor); 694 PUSHs (sv_cbor);
475 695
… …
481 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv) 701 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
482 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash)); 702 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
483 703
484 encode_tag (enc, CBOR_TAG_PERL_OBJECT); 704 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
485 encode_uint (enc, MAJOR_ARRAY, count + 1); 705 encode_uint (enc, MAJOR_ARRAY, count + 1);
486 encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash)); 706 encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
487 707
488 while (count) 708 {
709 int i;
710
711 for (i = 0; i < count; ++i)
489 encode_sv (enc, SP[1 - count--]); 712 encode_sv (enc, SP[i + 1 - count]);
713
714 SP -= count;
715 }
490 716
491 PUTBACK; 717 PUTBACK;
492 718
493 FREETMPS; LEAVE; 719 FREETMPS; LEAVE;
494 } 720 }
… …
516 742
517 if (ecb_expect_false (nv == (NV)(U32)nv)) 743 if (ecb_expect_false (nv == (NV)(U32)nv))
518 encode_uint (enc, MAJOR_POS_INT, (U32)nv); 744 encode_uint (enc, MAJOR_POS_INT, (U32)nv);
519 //TODO: maybe I32? 745 //TODO: maybe I32?
520 else if (ecb_expect_false (nv == (float)nv)) 746 else if (ecb_expect_false (nv == (float)nv))
521 { 747 encode_float32 (enc, nv);
522 uint32_t fp = ecb_float_to_binary32 (nv);
523
524 *enc->cur++ = MAJOR_MISC | MISC_FLOAT32;
525
526 if (!ecb_big_endian ())
527 fp = ecb_bswap32 (fp);
528
529 memcpy (enc->cur, &fp, 4);
530 enc->cur += 4;
531 }
532 else 748 else
533 { 749 encode_float64 (enc, nv);
534 uint64_t fp = ecb_double_to_binary64 (nv);
535
536 *enc->cur++ = MAJOR_MISC | MISC_FLOAT64;
537
538 if (!ecb_big_endian ())
539 fp = ecb_bswap64 (fp);
540
541 memcpy (enc->cur, &fp, 8);
542 enc->cur += 8;
543 }
544} 750}
545 751
546static void 752static void
547encode_sv (enc_t *enc, SV *sv) 753encode_sv (enc_t *enc, SV *sv)
548{ 754{
… …
550 756
551 if (SvPOKp (sv)) 757 if (SvPOKp (sv))
552 { 758 {
553 STRLEN len; 759 STRLEN len;
554 char *str = SvPV (sv, len); 760 char *str = SvPV (sv, len);
555 encode_strref (enc, SvUTF8 (sv), str, len); 761 encode_strref (enc, enc->cbor.flags & F_TEXT_STRINGS, SvUTF8 (sv), str, len);
556 } 762 }
557 else if (SvNOKp (sv)) 763 else if (SvNOKp (sv))
558 encode_nv (enc, sv); 764 encode_nv (enc, sv);
559 else if (SvIOKp (sv)) 765 else if (SvIOKp (sv))
560 { 766 encode_int (enc, sv);
561 if (SvIsUV (sv))
562 encode_uint (enc, MAJOR_POS_INT, SvUVX (sv));
563 else if (SvIVX (sv) >= 0)
564 encode_uint (enc, MAJOR_POS_INT, SvIVX (sv));
565 else
566 encode_uint (enc, MAJOR_NEG_INT, -(SvIVX (sv) + 1));
567 }
568 else if (SvROK (sv)) 767 else if (SvROK (sv))
569 encode_rv (enc, SvRV (sv)); 768 encode_rv (enc, SvRV (sv));
570 else if (!SvOK (sv)) 769 else if (!SvOK (sv))
571 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL); 770 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL);
572 else if (enc->cbor.flags & F_ALLOW_UNKNOWN) 771 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
… …
577} 776}
578 777
579static SV * 778static SV *
580encode_cbor (SV *scalar, CBOR *cbor) 779encode_cbor (SV *scalar, CBOR *cbor)
581{ 780{
582 enc_t enc = { }; 781 enc_t enc = { 0 };
583 782
584 enc.cbor = *cbor; 783 enc.cbor = *cbor;
585 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 784 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
586 enc.cur = SvPVX (enc.sv); 785 enc.cur = SvPVX (enc.sv);
587 enc.end = SvEND (enc.sv); 786 enc.end = SvEND (enc.sv);
588 787
589 SvPOK_only (enc.sv); 788 SvPOK_only (enc.sv);
590 789
591 if (cbor->flags & F_PACK_STRINGS) 790 if (cbor->flags & F_PACK_STRINGS)
592 { 791 {
… …
619 U32 depth; // recursion depth 818 U32 depth; // recursion depth
620 U32 maxdepth; // recursion depth limit 819 U32 maxdepth; // recursion depth limit
621 AV *shareable; 820 AV *shareable;
622 AV *stringref; 821 AV *stringref;
623 SV *decode_tagged; 822 SV *decode_tagged;
823 SV *err_sv; // optional sv for error, needs to be freed
624} dec_t; 824} dec_t;
625 825
626#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE 826// set dec->err to ERRSV
827ecb_cold static void
828err_errsv (dec_t *dec)
829{
830 if (!dec->err)
831 {
832 dec->err_sv = newSVsv (ERRSV);
627 833
628#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data") 834 // chop off the trailing \n
835 SvCUR_set (dec->err_sv, SvCUR (dec->err_sv) - 1);
836 *SvEND (dec->err_sv) = 0;
629 837
838 dec->err = SvPVutf8_nolen (dec->err_sv);
839 }
840}
841
842// the following functions are used to reduce code size and help the compiler to optimise
843ecb_cold static void
844err_set (dec_t *dec, const char *reason)
845{
846 if (!dec->err)
847 dec->err = reason;
848}
849
850ecb_cold static void
851err_unexpected_end (dec_t *dec)
852{
853 err_set (dec, "unexpected end of CBOR data");
854}
855
856#define ERR_DO(do) SB do; goto fail; SE
857#define ERR(reason) ERR_DO (err_set (dec, reason))
858#define ERR_ERRSV ERR_DO (err_errsv (dec))
859
860#define WANT(len) if (ecb_expect_false ((uintptr_t)(dec->end - dec->cur) < (STRLEN)len)) ERR_DO (err_unexpected_end (dec))
861
630#define DEC_INC_DEPTH if (++dec->depth > dec->cbor.max_depth) ERR (ERR_NESTING_EXCEEDED) 862#define DEC_INC_DEPTH if (ecb_expect_false (++dec->depth > dec->cbor.max_depth)) ERR (ERR_NESTING_EXCEEDED)
631#define DEC_DEC_DEPTH --dec->depth 863#define DEC_DEC_DEPTH --dec->depth
632 864
633static UV 865static UV
634decode_uint (dec_t *dec) 866decode_uint (dec_t *dec)
635{ 867{
… …
701 933
702 for (;;) 934 for (;;)
703 { 935 {
704 WANT (1); 936 WANT (1);
705 937
706 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF)) 938 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
707 { 939 {
708 ++dec->cur; 940 ++dec->cur;
709 break; 941 break;
710 } 942 }
711 943
712 av_push (av, decode_sv (dec)); 944 av_push (av, decode_sv (dec));
713 } 945 }
714 } 946 }
715 else 947 else
716 { 948 {
717 int i, len = decode_uint (dec); 949 UV i, len = decode_uint (dec);
718 950
719 WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays 951 WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays
720 av_fill (av, len - 1); 952 av_fill (av, len - 1);
721 953
722 for (i = 0; i < len; ++i) 954 for (i = 0; i < len; ++i)
… …
725 957
726 DEC_DEC_DEPTH; 958 DEC_DEC_DEPTH;
727 return newRV_noinc ((SV *)av); 959 return newRV_noinc ((SV *)av);
728 960
729fail: 961fail:
730 SvREFCNT_dec (av); 962 SvREFCNT_dec_NN (av);
731 DEC_DEC_DEPTH; 963 DEC_DEC_DEPTH;
732 return &PL_sv_undef; 964 return &PL_sv_undef;
733} 965}
734 966
735static void 967static void
… …
739 // byte or utf-8 strings as keys, but only when !stringref 971 // byte or utf-8 strings as keys, but only when !stringref
740 972
741 if (ecb_expect_true (!dec->stringref)) 973 if (ecb_expect_true (!dec->stringref))
742 if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8)) 974 if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
743 { 975 {
744 I32 len = decode_uint (dec); 976 STRLEN len = decode_uint (dec);
745 char *key = (char *)dec->cur; 977 char *key = (char *)dec->cur;
746 978
979 WANT (len);
747 dec->cur += len; 980 dec->cur += len;
748 981
749 hv_store (hv, key, len, decode_sv (dec), 0); 982 hv_store (hv, key, len, decode_sv (dec), 0);
750 983
751 return; 984 return;
752 } 985 }
753 else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8)) 986 else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8))
754 { 987 {
755 I32 len = decode_uint (dec); 988 STRLEN len = decode_uint (dec);
756 char *key = (char *)dec->cur; 989 char *key = (char *)dec->cur;
990 printf ("len %d\n", len);//D
757 991
992 WANT (len);
758 dec->cur += len; 993 dec->cur += len;
759 994
760 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8)) 995 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
761 if (!is_utf8_string (key, len)) 996 if (!cbor_is_utf8_string ((U8 *)key, len))
762 ERR ("corrupted CBOR data (invalid UTF-8 in map key)"); 997 ERR ("corrupted CBOR data (invalid UTF-8 in map key)");
763 998
764 hv_store (hv, key, -len, decode_sv (dec), 0); 999 hv_store (hv, key, -len, decode_sv (dec), 0);
765 1000
766 return; 1001 return;
767 } 1002 }
768 1003
769 SV *k = decode_sv (dec); 1004 SV *k = decode_sv (dec);
770 SV *v = decode_sv (dec); 1005 SV *v = decode_sv (dec);
771 1006
1007 // we leak memory if uncaught exceptions are thrown by random magical
1008 // methods, and this is hopefully the only place where it can happen,
1009 // so if there is a chance of an exception, take the very slow path.
1010 // since catching exceptions is "undocumented/internal/forbidden" by
1011 // the new p5p powers, we need to call out to a perl function :/
1012 if (ecb_expect_false (SvAMAGIC (k)))
1013 {
1014 dSP;
1015
1016 ENTER; SAVETMPS;
1017 PUSHMARK (SP);
1018 EXTEND (SP, 3);
1019 PUSHs (sv_2mortal (newRV_inc ((SV *)hv)));
1020 PUSHs (sv_2mortal (k));
1021 PUSHs (sv_2mortal (v));
1022
1023 PUTBACK;
1024 call_pv ("CBOR::XS::_hv_store", G_VOID | G_DISCARD | G_EVAL);
1025 SPAGAIN;
1026
1027 FREETMPS; LEAVE;
1028
1029 if (SvTRUE (ERRSV))
1030 ERR_ERRSV;
1031
1032 return;
1033 }
1034
772 hv_store_ent (hv, k, v, 0); 1035 hv_store_ent (hv, k, v, 0);
773 SvREFCNT_dec (k); 1036 SvREFCNT_dec_NN (k);
774 1037
775fail: 1038fail:
776 ; 1039 ;
777} 1040}
778 1041
… …
789 1052
790 for (;;) 1053 for (;;)
791 { 1054 {
792 WANT (1); 1055 WANT (1);
793 1056
794 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF)) 1057 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
795 { 1058 {
796 ++dec->cur; 1059 ++dec->cur;
797 break; 1060 break;
798 } 1061 }
799 1062
800 decode_he (dec, hv); 1063 decode_he (dec, hv);
801 } 1064 }
802 } 1065 }
803 else 1066 else
804 { 1067 {
805 int pairs = decode_uint (dec); 1068 UV pairs = decode_uint (dec);
1069
1070 WANT (pairs); // complexity check - need at least one byte per value, do not allow supersize hashes
806 1071
807 while (pairs--) 1072 while (pairs--)
808 decode_he (dec, hv); 1073 decode_he (dec, hv);
809 } 1074 }
810 1075
811 DEC_DEC_DEPTH; 1076 DEC_DEC_DEPTH;
812 return newRV_noinc ((SV *)hv); 1077 return newRV_noinc ((SV *)hv);
813 1078
814fail: 1079fail:
815 SvREFCNT_dec (hv); 1080 SvREFCNT_dec_NN (hv);
816 DEC_DEC_DEPTH; 1081 DEC_DEC_DEPTH;
817 return &PL_sv_undef; 1082 return &PL_sv_undef;
818} 1083}
819 1084
820static SV * 1085static SV *
821decode_str (dec_t *dec, int utf8) 1086decode_str (dec_t *dec, int utf8)
822{ 1087{
823 SV *sv = 0; 1088 SV *sv = 0;
824 1089
825 if ((*dec->cur & MINOR_MASK) == MINOR_INDEF) 1090 if (ecb_expect_false ((*dec->cur & MINOR_MASK) == MINOR_INDEF))
826 { 1091 {
827 // indefinite length strings 1092 // indefinite length strings
828 ++dec->cur; 1093 ++dec->cur;
829 1094
830 U8 major = *dec->cur & MAJOR_MISC; 1095 U8 major = *dec->cur & MAJOR_MISC;
… …
865 } 1130 }
866 1131
867 if (utf8) 1132 if (utf8)
868 { 1133 {
869 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8)) 1134 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
870 if (!is_utf8_string (SvPVX (sv), SvCUR (sv))) 1135 if (!cbor_is_utf8_string (SvPVX (sv), SvCUR (sv)))
871 ERR ("corrupted CBOR data (invalid UTF-8 in text string)"); 1136 ERR ("corrupted CBOR data (invalid UTF-8 in text string)");
872 1137
873 SvUTF8_on (sv); 1138 SvUTF8_on (sv);
874 } 1139 }
875 1140
… …
898 sv = newRV_noinc (decode_sv (dec)); 1163 sv = newRV_noinc (decode_sv (dec));
899 break; 1164 break;
900 1165
901 case CBOR_TAG_STRINGREF_NAMESPACE: 1166 case CBOR_TAG_STRINGREF_NAMESPACE:
902 { 1167 {
1168 // do not use SAVETMPS/FREETMPS, as these will
1169 // erase mortalised caches, e.g. "shareable"
903 ENTER; SAVETMPS; 1170 ENTER;
904 1171
905 SAVESPTR (dec->stringref); 1172 SAVESPTR (dec->stringref);
906 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ()); 1173 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ());
907 1174
908 sv = decode_sv (dec); 1175 sv = decode_sv (dec);
909 1176
910 FREETMPS; LEAVE; 1177 LEAVE;
911 } 1178 }
912 break; 1179 break;
913 1180
914 case CBOR_TAG_STRINGREF: 1181 case CBOR_TAG_STRINGREF:
915 { 1182 {
916 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT)) 1183 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
917 ERR ("corrupted CBOR data (stringref index not an unsigned integer)"); 1184 ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
918 1185
919 UV idx = decode_uint (dec); 1186 UV idx = decode_uint (dec);
920 1187
921 if (!dec->stringref || (int)idx > AvFILLp (dec->stringref)) 1188 if (!dec->stringref || idx >= (UV)(1 + AvFILLp (dec->stringref)))
922 ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)"); 1189 ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)");
923 1190
924 sv = newSVsv (AvARRAY (dec->stringref)[idx]); 1191 sv = newSVsv (AvARRAY (dec->stringref)[idx]);
925 } 1192 }
926 break; 1193 break;
… …
954 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT)) 1221 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
955 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)"); 1222 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
956 1223
957 UV idx = decode_uint (dec); 1224 UV idx = decode_uint (dec);
958 1225
959 if (!dec->shareable || (int)idx > AvFILLp (dec->shareable)) 1226 if (!dec->shareable || idx >= (UV)(1 + AvFILLp (dec->shareable)))
960 ERR ("corrupted CBOR data (sharedref index out of bounds)"); 1227 ERR ("corrupted CBOR data (sharedref index out of bounds)");
961 1228
962 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]); 1229 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
963 1230
964 if (sv == &PL_sv_undef) 1231 if (sv == &PL_sv_undef)
… …
966 } 1233 }
967 break; 1234 break;
968 1235
969 case CBOR_TAG_PERL_OBJECT: 1236 case CBOR_TAG_PERL_OBJECT:
970 { 1237 {
1238 if (dec->cbor.flags & F_FORBID_OBJECTS)
1239 goto filter;
1240
971 sv = decode_sv (dec); 1241 sv = decode_sv (dec);
972 1242
973 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV) 1243 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
974 ERR ("corrupted CBOR data (non-array perl object)"); 1244 ERR ("corrupted CBOR data (non-array perl object)");
975 1245
… …
985 if (!method) 1255 if (!method)
986 ERR ("cannot decode perl-object (package does not have a THAW method)"); 1256 ERR ("cannot decode perl-object (package does not have a THAW method)");
987 1257
988 dSP; 1258 dSP;
989 1259
990 ENTER; SAVETMPS; PUSHMARK (SP); 1260 ENTER; SAVETMPS;
1261 PUSHMARK (SP);
991 EXTEND (SP, len + 1); 1262 EXTEND (SP, len + 1);
992 // we re-bless the reference to get overload and other niceties right 1263 // we re-bless the reference to get overload and other niceties right
993 PUSHs (*av_fetch (av, 0, 1)); 1264 PUSHs (*av_fetch (av, 0, 1));
994 PUSHs (sv_cbor); 1265 PUSHs (sv_cbor);
995 1266
… …
1003 SPAGAIN; 1274 SPAGAIN;
1004 1275
1005 if (SvTRUE (ERRSV)) 1276 if (SvTRUE (ERRSV))
1006 { 1277 {
1007 FREETMPS; LEAVE; 1278 FREETMPS; LEAVE;
1008 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); 1279 ERR_ERRSV;
1009 } 1280 }
1010 1281
1011 SvREFCNT_dec (sv); 1282 SvREFCNT_dec_NN (sv);
1012 sv = SvREFCNT_inc (POPs); 1283 sv = SvREFCNT_inc (POPs);
1013 1284
1014 PUTBACK; 1285 PUTBACK;
1015 1286
1016 FREETMPS; LEAVE; 1287 FREETMPS; LEAVE;
1017 } 1288 }
1018 break; 1289 break;
1019 1290
1020 default: 1291 default:
1292 filter:
1021 { 1293 {
1294 SV *tag_sv = newSVuv (tag);
1295
1022 sv = decode_sv (dec); 1296 sv = decode_sv (dec);
1023 1297
1024 dSP; 1298 dSP;
1025 ENTER; SAVETMPS; PUSHMARK (SP); 1299 ENTER; SAVETMPS;
1300 PUSHMARK (SP);
1026 EXTEND (SP, 2); 1301 EXTEND (SP, 2);
1027 PUSHs (newSVuv (tag)); 1302 PUSHs (tag_sv);
1028 PUSHs (sv); 1303 PUSHs (sv);
1029 1304
1030 PUTBACK; 1305 PUTBACK;
1031 int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL); 1306 int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL);
1032 SPAGAIN; 1307 SPAGAIN;
1033 1308
1034 if (SvTRUE (ERRSV)) 1309 if (SvTRUE (ERRSV))
1035 { 1310 {
1311 SvREFCNT_dec_NN (tag_sv);
1036 FREETMPS; LEAVE; 1312 FREETMPS; LEAVE;
1037 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); 1313 ERR_ERRSV;
1038 } 1314 }
1039 1315
1040 if (count) 1316 if (count)
1041 { 1317 {
1318 SvREFCNT_dec_NN (tag_sv);
1042 SvREFCNT_dec (sv); 1319 SvREFCNT_dec_NN (sv);
1043 sv = SvREFCNT_inc (POPs); 1320 sv = SvREFCNT_inc_NN (TOPs);
1321 SP -= count;
1044 } 1322 }
1045 else 1323 else
1046 { 1324 {
1047 AV *av = newAV (); 1325 AV *av = newAV ();
1048 av_push (av, newSVuv (tag)); 1326 av_push (av, tag_sv);
1049 av_push (av, sv); 1327 av_push (av, sv);
1050 1328
1051 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 1329 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
1052 ? cbor_tagged_stash 1330 ? cbor_tagged_stash
1053 : gv_stashpv ("CBOR::XS::Tagged" , 1); 1331 : gv_stashpv ("CBOR::XS::Tagged" , 1);
… …
1156} 1434}
1157 1435
1158static SV * 1436static SV *
1159decode_cbor (SV *string, CBOR *cbor, char **offset_return) 1437decode_cbor (SV *string, CBOR *cbor, char **offset_return)
1160{ 1438{
1161 dec_t dec = { }; 1439 dec_t dec = { 0 };
1162 SV *sv; 1440 SV *sv;
1163 STRLEN len; 1441 STRLEN len;
1164 char *data = SvPVbyte (string, len); 1442 char *data = SvPVbyte (string, len);
1165 1443
1166 if (len > cbor->max_size && cbor->max_size) 1444 if (len > cbor->max_size && cbor->max_size)
… …
1182 1460
1183 if (dec.err) 1461 if (dec.err)
1184 { 1462 {
1185 if (dec.shareable) 1463 if (dec.shareable)
1186 { 1464 {
1187 // need to break cyclic links, which whould all be in shareable 1465 // need to break cyclic links, which would all be in shareable
1188 int i; 1466 int i;
1189 SV **svp; 1467 SV **svp;
1190 1468
1191 for (i = av_len (dec.shareable) + 1; i--; ) 1469 for (i = av_len (dec.shareable) + 1; i--; )
1192 if ((svp = av_fetch (dec.shareable, i, 0))) 1470 if ((svp = av_fetch (dec.shareable, i, 0)))
1193 sv_setsv (*svp, &PL_sv_undef); 1471 sv_setsv (*svp, &PL_sv_undef);
1194 } 1472 }
1195 1473
1196 SvREFCNT_dec (sv); 1474 SvREFCNT_dec_NN (sv);
1475
1476 if (dec.err_sv)
1477 sv_2mortal (dec.err_sv);
1478
1197 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur); 1479 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur);
1198 } 1480 }
1199 1481
1200 sv = sv_2mortal (sv); 1482 sv = sv_2mortal (sv);
1201 1483
… …
1257 1539
1258 int major = *p >> MAJOR_SHIFT; 1540 int major = *p >> MAJOR_SHIFT;
1259 1541
1260 switch (major) 1542 switch (major)
1261 { 1543 {
1544 case MAJOR_TAG >> MAJOR_SHIFT:
1545 ++count; // tags merely prefix another value
1546 break;
1547
1262 case MAJOR_BYTES >> MAJOR_SHIFT: 1548 case MAJOR_BYTES >> MAJOR_SHIFT:
1263 case MAJOR_TEXT >> MAJOR_SHIFT: 1549 case MAJOR_TEXT >> MAJOR_SHIFT:
1264 case MAJOR_ARRAY >> MAJOR_SHIFT: 1550 case MAJOR_ARRAY >> MAJOR_SHIFT:
1265 case MAJOR_MAP >> MAJOR_SHIFT: 1551 case MAJOR_MAP >> MAJOR_SHIFT:
1266 { 1552 {
… …
1287 1573
1288 break; 1574 break;
1289 1575
1290 case MAJOR_MAP >> MAJOR_SHIFT: 1576 case MAJOR_MAP >> MAJOR_SHIFT:
1291 len <<= 1; 1577 len <<= 1;
1578 /* FALLTHROUGH */
1292 case MAJOR_ARRAY >> MAJOR_SHIFT: 1579 case MAJOR_ARRAY >> MAJOR_SHIFT:
1293 if (len) 1580 if (len)
1294 { 1581 {
1295 av_push (self->incr_count, newSViv (len + 1)); //TODO: nest 1582 av_push (self->incr_count, newSViv (len + 1)); //TODO: nest
1296 count = len + 1; 1583 count = len + 1;
… …
1341 1628
1342 default_filter = newSVpv ("CBOR::XS::default_filter", 0); 1629 default_filter = newSVpv ("CBOR::XS::default_filter", 0);
1343 1630
1344 sv_cbor = newSVpv ("CBOR", 0); 1631 sv_cbor = newSVpv ("CBOR", 0);
1345 SvREADONLY_on (sv_cbor); 1632 SvREADONLY_on (sv_cbor);
1633
1634 assert (("STRLEN must be an unsigned type", 0 <= (STRLEN)-1));
1346} 1635}
1347 1636
1348PROTOTYPES: DISABLE 1637PROTOTYPES: DISABLE
1349 1638
1350void CLONE (...) 1639void CLONE (...)
… …
1370 ALIAS: 1659 ALIAS:
1371 shrink = F_SHRINK 1660 shrink = F_SHRINK
1372 allow_unknown = F_ALLOW_UNKNOWN 1661 allow_unknown = F_ALLOW_UNKNOWN
1373 allow_sharing = F_ALLOW_SHARING 1662 allow_sharing = F_ALLOW_SHARING
1374 allow_cycles = F_ALLOW_CYCLES 1663 allow_cycles = F_ALLOW_CYCLES
1664 forbid_objects = F_FORBID_OBJECTS
1375 pack_strings = F_PACK_STRINGS 1665 pack_strings = F_PACK_STRINGS
1666 text_keys = F_TEXT_KEYS
1667 text_strings = F_TEXT_STRINGS
1376 validate_utf8 = F_VALIDATE_UTF8 1668 validate_utf8 = F_VALIDATE_UTF8
1377 PPCODE: 1669 PPCODE:
1378{ 1670{
1379 if (enable) 1671 if (enable)
1380 self->flags |= ix; 1672 self->flags |= ix;
… …
1388 ALIAS: 1680 ALIAS:
1389 get_shrink = F_SHRINK 1681 get_shrink = F_SHRINK
1390 get_allow_unknown = F_ALLOW_UNKNOWN 1682 get_allow_unknown = F_ALLOW_UNKNOWN
1391 get_allow_sharing = F_ALLOW_SHARING 1683 get_allow_sharing = F_ALLOW_SHARING
1392 get_allow_cycles = F_ALLOW_CYCLES 1684 get_allow_cycles = F_ALLOW_CYCLES
1685 get_forbid_objects = F_FORBID_OBJECTS
1393 get_pack_strings = F_PACK_STRINGS 1686 get_pack_strings = F_PACK_STRINGS
1687 get_text_keys = F_TEXT_KEYS
1688 get_text_strings = F_TEXT_STRINGS
1394 get_validate_utf8 = F_VALIDATE_UTF8 1689 get_validate_utf8 = F_VALIDATE_UTF8
1395 PPCODE: 1690 PPCODE:
1396 XPUSHs (boolSV (self->flags & ix)); 1691 XPUSHs (boolSV (self->flags & ix));
1397 1692
1398void max_depth (CBOR *self, U32 max_depth = 0x80000000UL) 1693void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
… …
1528 cbor_init (&cbor); 1823 cbor_init (&cbor);
1529 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN; 1824 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN;
1530 XPUSHs (cborstr); 1825 XPUSHs (cborstr);
1531} 1826}
1532 1827
1828#ifdef __AFL_COMPILER
1829
1830void
1831afl_init ()
1832 CODE:
1833 __AFL_INIT ();
1834
1835int
1836afl_loop (unsigned int count = 10000)
1837 CODE:
1838 RETVAL = __AFL_LOOP (count);
1839 OUTPUT:
1840 RETVAL
1841
1842#endif
1843

Diff Legend

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