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.55 by root, Fri Nov 25 06:13:16 2016 UTC vs.
Revision 1.65 by root, Thu Nov 15 19:52:41 2018 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
28 32
29// known major and minor types 33// known major and minor types
… …
99 103
100#define F_SHRINK 0x00000001UL 104#define F_SHRINK 0x00000001UL
101#define F_ALLOW_UNKNOWN 0x00000002UL 105#define F_ALLOW_UNKNOWN 0x00000002UL
102#define F_ALLOW_SHARING 0x00000004UL 106#define F_ALLOW_SHARING 0x00000004UL
103#define F_ALLOW_CYCLES 0x00000008UL 107#define F_ALLOW_CYCLES 0x00000008UL
108#define F_FORBID_OBJECTS 0x00000010UL
104#define F_PACK_STRINGS 0x00000010UL 109#define F_PACK_STRINGS 0x00000020UL
105#define F_TEXT_KEYS 0x00000020UL 110#define F_TEXT_KEYS 0x00000040UL
106#define F_TEXT_STRINGS 0x00000040UL 111#define F_TEXT_STRINGS 0x00000080UL
107#define F_VALIDATE_UTF8 0x00000080UL 112#define F_VALIDATE_UTF8 0x00000100UL
108 113
109#define INIT_SIZE 32 // initial scalar size to be allocated 114#define INIT_SIZE 32 // initial scalar size to be allocated
110 115
111#define SB do { 116#define SB do {
112#define SE } while (0) 117#define SE } while (0)
… …
185 190
186// minimum length of a string to be registered for stringref 191// minimum length of a string to be registered for stringref
187ecb_inline int 192ecb_inline int
188minimum_string_length (UV idx) 193minimum_string_length (UV idx)
189{ 194{
190 return idx > 23 195 return idx <= 23 ? 3
191 ? idx > 0xffU 196 : idx <= 0xffU ? 4
192 ? idx > 0xffffU 197 : idx <= 0xffffU ? 5
193 ? idx > 0xffffffffU 198 : idx <= 0xffffffffU ? 7
194 ? 11 199 : 11;
195 : 7
196 : 5
197 : 4
198 : 3;
199} 200}
200 201
201///////////////////////////////////////////////////////////////////////////// 202/////////////////////////////////////////////////////////////////////////////
202// encoder 203// encoder
203 204
… …
216} enc_t; 217} enc_t;
217 218
218ecb_inline void 219ecb_inline void
219need (enc_t *enc, STRLEN len) 220need (enc_t *enc, STRLEN len)
220{ 221{
221 if (ecb_expect_false (enc->cur + len >= enc->end)) 222 if (ecb_expect_false ((uintptr_t)(enc->end - enc->cur) < len))
222 { 223 {
223 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 224 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
224 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 225 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
225 enc->cur = SvPVX (enc->sv) + cur; 226 enc->cur = SvPVX (enc->sv) + cur;
226 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 227 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
… …
356 357
357 ++enc->depth; 358 ++enc->depth;
358 359
359 encode_uint (enc, MAJOR_ARRAY, len + 1); 360 encode_uint (enc, MAJOR_ARRAY, len + 1);
360 361
361 if (SvMAGICAL (av)) 362 if (ecb_expect_false (SvMAGICAL (av)))
362 for (i = 0; i <= len; ++i) 363 for (i = 0; i <= len; ++i)
363 { 364 {
364 SV **svp = av_fetch (av, i, 0); 365 SV **svp = av_fetch (av, i, 0);
365 encode_sv (enc, svp ? *svp : &PL_sv_undef); 366 encode_sv (enc, svp ? *svp : &PL_sv_undef);
366 } 367 }
… …
385 ++enc->depth; 386 ++enc->depth;
386 387
387 int pairs = hv_iterinit (hv); 388 int pairs = hv_iterinit (hv);
388 int mg = SvMAGICAL (hv); 389 int mg = SvMAGICAL (hv);
389 390
390 if (mg) 391 if (ecb_expect_false (mg))
391 encode_ch (enc, MAJOR_MAP | MINOR_INDEF); 392 encode_ch (enc, MAJOR_MAP | MINOR_INDEF);
392 else 393 else
393 encode_uint (enc, MAJOR_MAP, pairs); 394 encode_uint (enc, MAJOR_MAP, pairs);
394 395
395 while ((he = hv_iternext (hv))) 396 while ((he = hv_iternext (hv)))
… …
400 encode_strref (enc, enc->cbor.flags & (F_TEXT_KEYS | F_TEXT_STRINGS), HeKUTF8 (he), HeKEY (he), HeKLEN (he)); 401 encode_strref (enc, enc->cbor.flags & (F_TEXT_KEYS | F_TEXT_STRINGS), HeKUTF8 (he), HeKEY (he), HeKLEN (he));
401 402
402 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he)); 403 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));
403 } 404 }
404 405
405 if (mg) 406 if (ecb_expect_false (mg))
406 encode_ch (enc, MAJOR_MISC | MINOR_INDEF); 407 encode_ch (enc, MAJOR_MISC | MINOR_INDEF);
407 408
408 --enc->depth; 409 --enc->depth;
409} 410}
410 411
… …
453 } 454 }
454 455
455 if (ecb_expect_false (SvREFCNT (sv) > 1) 456 if (ecb_expect_false (SvREFCNT (sv) > 1)
456 && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)) 457 && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING))
457 { 458 {
458 if (!enc->shareable) 459 if (ecb_expect_false (!enc->shareable))
459 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ()); 460 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ());
460 461
461 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1); 462 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1);
462 463
463 if (SvOK (*svp)) 464 if (SvOK (*svp))
… …
477 if (ecb_expect_false (SvOBJECT (sv))) 478 if (ecb_expect_false (SvOBJECT (sv)))
478 { 479 {
479 HV *stash = SvSTASH (sv); 480 HV *stash = SvSTASH (sv);
480 GV *method; 481 GV *method;
481 482
483 if (enc->cbor.flags & F_FORBID_OBJECTS)
484 croak ("encountered object '%s', but forbid_objects is enabled",
485 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
482 if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0))) 486 else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
483 { 487 {
484 dSP; 488 dSP;
485 489
486 ENTER; SAVETMPS; 490 ENTER; SAVETMPS;
487 PUSHMARK (SP); 491 PUSHMARK (SP);
… …
506 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0) 510 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
507 { 511 {
508 dSP; 512 dSP;
509 513
510 ENTER; SAVETMPS; 514 ENTER; SAVETMPS;
511 SAVESTACK_POS ();
512 PUSHMARK (SP); 515 PUSHMARK (SP);
513 EXTEND (SP, 2); 516 EXTEND (SP, 2);
514 // we re-bless the reference to get overload and other niceties right 517 // we re-bless the reference to get overload and other niceties right
515 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 518 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
516 PUSHs (sv_cbor); 519 PUSHs (sv_cbor);
… …
525 528
526 encode_tag (enc, CBOR_TAG_PERL_OBJECT); 529 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
527 encode_uint (enc, MAJOR_ARRAY, count + 1); 530 encode_uint (enc, MAJOR_ARRAY, count + 1);
528 encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash)); 531 encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
529 532
530 while (count) 533 {
534 int i;
535
536 for (i = 0; i < count; ++i)
531 encode_sv (enc, SP[1 - count--]); 537 encode_sv (enc, SP[i + 1 - count]);
538
539 SP -= count;
540 }
532 541
533 PUTBACK; 542 PUTBACK;
534 543
535 FREETMPS; LEAVE; 544 FREETMPS; LEAVE;
536 } 545 }
… …
559 if (ecb_expect_false (nv == (NV)(U32)nv)) 568 if (ecb_expect_false (nv == (NV)(U32)nv))
560 encode_uint (enc, MAJOR_POS_INT, (U32)nv); 569 encode_uint (enc, MAJOR_POS_INT, (U32)nv);
561 //TODO: maybe I32? 570 //TODO: maybe I32?
562 else if (ecb_expect_false (nv == (float)nv)) 571 else if (ecb_expect_false (nv == (float)nv))
563 { 572 {
573 *enc->cur++ = MAJOR_MISC | MISC_FLOAT32;
574
564 uint32_t fp = ecb_float_to_binary32 (nv); 575 uint32_t fp = ecb_float_to_binary32 (nv);
565
566 *enc->cur++ = MAJOR_MISC | MISC_FLOAT32;
567 576
568 if (!ecb_big_endian ()) 577 if (!ecb_big_endian ())
569 fp = ecb_bswap32 (fp); 578 fp = ecb_bswap32 (fp);
570 579
571 memcpy (enc->cur, &fp, 4); 580 memcpy (enc->cur, &fp, 4);
572 enc->cur += 4; 581 enc->cur += 4;
573 } 582 }
574 else 583 else
575 { 584 {
585 *enc->cur++ = MAJOR_MISC | MISC_FLOAT64;
586
576 uint64_t fp = ecb_double_to_binary64 (nv); 587 uint64_t fp = ecb_double_to_binary64 (nv);
577
578 *enc->cur++ = MAJOR_MISC | MISC_FLOAT64;
579 588
580 if (!ecb_big_endian ()) 589 if (!ecb_big_endian ())
581 fp = ecb_bswap64 (fp); 590 fp = ecb_bswap64 (fp);
582 591
583 memcpy (enc->cur, &fp, 8); 592 memcpy (enc->cur, &fp, 8);
… …
621static SV * 630static SV *
622encode_cbor (SV *scalar, CBOR *cbor) 631encode_cbor (SV *scalar, CBOR *cbor)
623{ 632{
624 enc_t enc = { 0 }; 633 enc_t enc = { 0 };
625 634
626 enc.cbor = *cbor; 635 enc.cbor = *cbor;
627 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 636 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
628 enc.cur = SvPVX (enc.sv); 637 enc.cur = SvPVX (enc.sv);
629 enc.end = SvEND (enc.sv); 638 enc.end = SvEND (enc.sv);
630 639
631 SvPOK_only (enc.sv); 640 SvPOK_only (enc.sv);
632 641
633 if (cbor->flags & F_PACK_STRINGS) 642 if (cbor->flags & F_PACK_STRINGS)
634 { 643 {
… …
661 U32 depth; // recursion depth 670 U32 depth; // recursion depth
662 U32 maxdepth; // recursion depth limit 671 U32 maxdepth; // recursion depth limit
663 AV *shareable; 672 AV *shareable;
664 AV *stringref; 673 AV *stringref;
665 SV *decode_tagged; 674 SV *decode_tagged;
675 SV *err_sv; // optional sv for error, needs to be freed
666} dec_t; 676} dec_t;
667 677
668#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE 678// set dec->err to ERRSV
679ecb_cold static void
680err_errsv (dec_t *dec)
681{
682 if (!dec->err)
683 {
684 dec->err_sv = newSVsv (ERRSV);
669 685
670#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data") 686 // chop off the trailing \n
687 SvCUR_set (dec->err_sv, SvCUR (dec->err_sv) - 1);
688 *SvEND (dec->err_sv) = 0;
671 689
690 dec->err = SvPVutf8_nolen (dec->err_sv);
691 }
692}
693
694// the following functions are used to reduce code size and help the compiler to optimise
695ecb_cold static void
696err_set (dec_t *dec, const char *reason)
697{
698 if (!dec->err)
699 dec->err = reason;
700}
701
702ecb_cold static void
703err_unexpected_end (dec_t *dec)
704{
705 err_set (dec, "unexpected end of CBOR data");
706}
707
708#define ERR_DO(do) SB do; goto fail; SE
709#define ERR(reason) ERR_DO (err_set (dec, reason))
710#define ERR_ERRSV ERR_DO (err_errsv (dec))
711
712#define WANT(len) if (ecb_expect_false ((uintptr_t)(dec->end - dec->cur) < (STRLEN)len)) ERR_DO (err_unexpected_end (dec))
713
672#define DEC_INC_DEPTH if (++dec->depth > dec->cbor.max_depth) ERR (ERR_NESTING_EXCEEDED) 714#define DEC_INC_DEPTH if (ecb_expect_false (++dec->depth > dec->cbor.max_depth)) ERR (ERR_NESTING_EXCEEDED)
673#define DEC_DEC_DEPTH --dec->depth 715#define DEC_DEC_DEPTH --dec->depth
674 716
675static UV 717static UV
676decode_uint (dec_t *dec) 718decode_uint (dec_t *dec)
677{ 719{
… …
743 785
744 for (;;) 786 for (;;)
745 { 787 {
746 WANT (1); 788 WANT (1);
747 789
748 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF)) 790 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
749 { 791 {
750 ++dec->cur; 792 ++dec->cur;
751 break; 793 break;
752 } 794 }
753 795
754 av_push (av, decode_sv (dec)); 796 av_push (av, decode_sv (dec));
755 } 797 }
756 } 798 }
757 else 799 else
758 { 800 {
759 int i, len = decode_uint (dec); 801 UV i, len = decode_uint (dec);
760 802
761 WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays 803 WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays
762 av_fill (av, len - 1); 804 av_fill (av, len - 1);
763 805
764 for (i = 0; i < len; ++i) 806 for (i = 0; i < len; ++i)
… …
767 809
768 DEC_DEC_DEPTH; 810 DEC_DEC_DEPTH;
769 return newRV_noinc ((SV *)av); 811 return newRV_noinc ((SV *)av);
770 812
771fail: 813fail:
772 SvREFCNT_dec (av); 814 SvREFCNT_dec_NN (av);
773 DEC_DEC_DEPTH; 815 DEC_DEC_DEPTH;
774 return &PL_sv_undef; 816 return &PL_sv_undef;
775} 817}
776 818
777static void 819static void
… …
781 // byte or utf-8 strings as keys, but only when !stringref 823 // byte or utf-8 strings as keys, but only when !stringref
782 824
783 if (ecb_expect_true (!dec->stringref)) 825 if (ecb_expect_true (!dec->stringref))
784 if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8)) 826 if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
785 { 827 {
786 I32 len = decode_uint (dec); 828 STRLEN len = decode_uint (dec);
787 char *key = (char *)dec->cur; 829 char *key = (char *)dec->cur;
788 830
789 WANT (len); 831 WANT (len);
790 dec->cur += len; 832 dec->cur += len;
791 833
… …
793 835
794 return; 836 return;
795 } 837 }
796 else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8)) 838 else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8))
797 { 839 {
798 I32 len = decode_uint (dec); 840 STRLEN len = decode_uint (dec);
799 char *key = (char *)dec->cur; 841 char *key = (char *)dec->cur;
800 842
801 WANT (len); 843 WANT (len);
802 dec->cur += len; 844 dec->cur += len;
803 845
… …
811 } 853 }
812 854
813 SV *k = decode_sv (dec); 855 SV *k = decode_sv (dec);
814 SV *v = decode_sv (dec); 856 SV *v = decode_sv (dec);
815 857
858 // we leak memory if uncaught exceptions are thrown by random magical
859 // methods, and this is hopefully the only place where it can happen,
860 // so if there is a chance of an exception, take the very slow path.
861 // since catching exceptions is "undocumented/internal/forbidden" by
862 // the new p5p powers, we need to call out to a perl function :/
863 if (ecb_expect_false (SvAMAGIC (k)))
864 {
865 dSP;
866
867 ENTER; SAVETMPS;
868 PUSHMARK (SP);
869 EXTEND (SP, 3);
870 PUSHs (sv_2mortal (newRV_inc ((SV *)hv)));
871 PUSHs (sv_2mortal (k));
872 PUSHs (sv_2mortal (v));
873
874 PUTBACK;
875 call_pv ("CBOR::XS::_hv_store", G_VOID | G_DISCARD | G_EVAL);
876 SPAGAIN;
877
878 FREETMPS; LEAVE;
879
880 if (SvTRUE (ERRSV))
881 ERR_ERRSV;
882
883 return;
884 }
885
816 hv_store_ent (hv, k, v, 0); 886 hv_store_ent (hv, k, v, 0);
817 SvREFCNT_dec (k); 887 SvREFCNT_dec_NN (k);
818 888
819fail: 889fail:
820 ; 890 ;
821} 891}
822 892
… …
833 903
834 for (;;) 904 for (;;)
835 { 905 {
836 WANT (1); 906 WANT (1);
837 907
838 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF)) 908 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
839 { 909 {
840 ++dec->cur; 910 ++dec->cur;
841 break; 911 break;
842 } 912 }
843 913
844 decode_he (dec, hv); 914 decode_he (dec, hv);
845 } 915 }
846 } 916 }
847 else 917 else
848 { 918 {
849 int pairs = decode_uint (dec); 919 UV pairs = decode_uint (dec);
920
921 WANT (pairs); // complexity check - need at least one byte per value, do not allow supersize hashes
850 922
851 while (pairs--) 923 while (pairs--)
852 decode_he (dec, hv); 924 decode_he (dec, hv);
853 } 925 }
854 926
855 DEC_DEC_DEPTH; 927 DEC_DEC_DEPTH;
856 return newRV_noinc ((SV *)hv); 928 return newRV_noinc ((SV *)hv);
857 929
858fail: 930fail:
859 SvREFCNT_dec (hv); 931 SvREFCNT_dec_NN (hv);
860 DEC_DEC_DEPTH; 932 DEC_DEC_DEPTH;
861 return &PL_sv_undef; 933 return &PL_sv_undef;
862} 934}
863 935
864static SV * 936static SV *
865decode_str (dec_t *dec, int utf8) 937decode_str (dec_t *dec, int utf8)
866{ 938{
867 SV *sv = 0; 939 SV *sv = 0;
868 940
869 if ((*dec->cur & MINOR_MASK) == MINOR_INDEF) 941 if (ecb_expect_false ((*dec->cur & MINOR_MASK) == MINOR_INDEF))
870 { 942 {
871 // indefinite length strings 943 // indefinite length strings
872 ++dec->cur; 944 ++dec->cur;
873 945
874 U8 major = *dec->cur & MAJOR_MISC; 946 U8 major = *dec->cur & MAJOR_MISC;
… …
942 sv = newRV_noinc (decode_sv (dec)); 1014 sv = newRV_noinc (decode_sv (dec));
943 break; 1015 break;
944 1016
945 case CBOR_TAG_STRINGREF_NAMESPACE: 1017 case CBOR_TAG_STRINGREF_NAMESPACE:
946 { 1018 {
947 // do nmot use SAVETMPS/FREETMPS, as these will 1019 // do not use SAVETMPS/FREETMPS, as these will
948 // erase mortalised caches, e.g. "shareable" 1020 // erase mortalised caches, e.g. "shareable"
949 ENTER; 1021 ENTER;
950 1022
951 SAVESPTR (dec->stringref); 1023 SAVESPTR (dec->stringref);
952 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ()); 1024 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ());
… …
962 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT)) 1034 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
963 ERR ("corrupted CBOR data (stringref index not an unsigned integer)"); 1035 ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
964 1036
965 UV idx = decode_uint (dec); 1037 UV idx = decode_uint (dec);
966 1038
967 if (!dec->stringref || (int)idx > AvFILLp (dec->stringref)) 1039 if (!dec->stringref || idx >= (UV)(1 + AvFILLp (dec->stringref)))
968 ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)"); 1040 ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)");
969 1041
970 sv = newSVsv (AvARRAY (dec->stringref)[idx]); 1042 sv = newSVsv (AvARRAY (dec->stringref)[idx]);
971 } 1043 }
972 break; 1044 break;
… …
1000 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT)) 1072 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
1001 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)"); 1073 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
1002 1074
1003 UV idx = decode_uint (dec); 1075 UV idx = decode_uint (dec);
1004 1076
1005 if (!dec->shareable || (int)idx > AvFILLp (dec->shareable)) 1077 if (!dec->shareable || idx >= (UV)(1 + AvFILLp (dec->shareable)))
1006 ERR ("corrupted CBOR data (sharedref index out of bounds)"); 1078 ERR ("corrupted CBOR data (sharedref index out of bounds)");
1007 1079
1008 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]); 1080 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
1009 1081
1010 if (sv == &PL_sv_undef) 1082 if (sv == &PL_sv_undef)
… …
1012 } 1084 }
1013 break; 1085 break;
1014 1086
1015 case CBOR_TAG_PERL_OBJECT: 1087 case CBOR_TAG_PERL_OBJECT:
1016 { 1088 {
1089 if (dec->cbor.flags & F_FORBID_OBJECTS)
1090 goto filter;
1091
1017 sv = decode_sv (dec); 1092 sv = decode_sv (dec);
1018 1093
1019 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV) 1094 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
1020 ERR ("corrupted CBOR data (non-array perl object)"); 1095 ERR ("corrupted CBOR data (non-array perl object)");
1021 1096
… …
1050 SPAGAIN; 1125 SPAGAIN;
1051 1126
1052 if (SvTRUE (ERRSV)) 1127 if (SvTRUE (ERRSV))
1053 { 1128 {
1054 FREETMPS; LEAVE; 1129 FREETMPS; LEAVE;
1055 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); 1130 ERR_ERRSV;
1056 } 1131 }
1057 1132
1058 SvREFCNT_dec (sv); 1133 SvREFCNT_dec_NN (sv);
1059 sv = SvREFCNT_inc (POPs); 1134 sv = SvREFCNT_inc (POPs);
1060 1135
1061 PUTBACK; 1136 PUTBACK;
1062 1137
1063 FREETMPS; LEAVE; 1138 FREETMPS; LEAVE;
1064 } 1139 }
1065 break; 1140 break;
1066 1141
1067 default: 1142 default:
1143 filter:
1068 { 1144 {
1145 SV *tag_sv = newSVuv (tag);
1146
1069 sv = decode_sv (dec); 1147 sv = decode_sv (dec);
1070 1148
1071 dSP; 1149 dSP;
1072 ENTER; SAVETMPS; 1150 ENTER; SAVETMPS;
1073 SAVESTACK_POS ();
1074 PUSHMARK (SP); 1151 PUSHMARK (SP);
1075 EXTEND (SP, 2); 1152 EXTEND (SP, 2);
1076 PUSHs (newSVuv (tag)); 1153 PUSHs (tag_sv);
1077 PUSHs (sv); 1154 PUSHs (sv);
1078 1155
1079 PUTBACK; 1156 PUTBACK;
1080 int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL); 1157 int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL);
1081 SPAGAIN; 1158 SPAGAIN;
1082 1159
1083 if (SvTRUE (ERRSV)) 1160 if (SvTRUE (ERRSV))
1084 { 1161 {
1162 SvREFCNT_dec_NN (tag_sv);
1085 FREETMPS; LEAVE; 1163 FREETMPS; LEAVE;
1086 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); 1164 ERR_ERRSV;
1087 } 1165 }
1088 1166
1089 if (count) 1167 if (count)
1090 { 1168 {
1169 SvREFCNT_dec_NN (tag_sv);
1091 SvREFCNT_dec (sv); 1170 SvREFCNT_dec_NN (sv);
1092 sv = SvREFCNT_inc (POPs); 1171 sv = SvREFCNT_inc_NN (TOPs);
1172 SP -= count;
1093 } 1173 }
1094 else 1174 else
1095 { 1175 {
1096 AV *av = newAV (); 1176 AV *av = newAV ();
1097 av_push (av, newSVuv (tag)); 1177 av_push (av, tag_sv);
1098 av_push (av, sv); 1178 av_push (av, sv);
1099 1179
1100 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 1180 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
1101 ? cbor_tagged_stash 1181 ? cbor_tagged_stash
1102 : gv_stashpv ("CBOR::XS::Tagged" , 1); 1182 : gv_stashpv ("CBOR::XS::Tagged" , 1);
… …
1231 1311
1232 if (dec.err) 1312 if (dec.err)
1233 { 1313 {
1234 if (dec.shareable) 1314 if (dec.shareable)
1235 { 1315 {
1236 // need to break cyclic links, which whould all be in shareable 1316 // need to break cyclic links, which would all be in shareable
1237 int i; 1317 int i;
1238 SV **svp; 1318 SV **svp;
1239 1319
1240 for (i = av_len (dec.shareable) + 1; i--; ) 1320 for (i = av_len (dec.shareable) + 1; i--; )
1241 if ((svp = av_fetch (dec.shareable, i, 0))) 1321 if ((svp = av_fetch (dec.shareable, i, 0)))
1242 sv_setsv (*svp, &PL_sv_undef); 1322 sv_setsv (*svp, &PL_sv_undef);
1243 } 1323 }
1244 1324
1245 SvREFCNT_dec (sv); 1325 SvREFCNT_dec_NN (sv);
1326
1327 if (dec.err_sv)
1328 sv_2mortal (dec.err_sv);
1329
1246 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur); 1330 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur);
1247 } 1331 }
1248 1332
1249 sv = sv_2mortal (sv); 1333 sv = sv_2mortal (sv);
1250 1334
… …
1394 1478
1395 default_filter = newSVpv ("CBOR::XS::default_filter", 0); 1479 default_filter = newSVpv ("CBOR::XS::default_filter", 0);
1396 1480
1397 sv_cbor = newSVpv ("CBOR", 0); 1481 sv_cbor = newSVpv ("CBOR", 0);
1398 SvREADONLY_on (sv_cbor); 1482 SvREADONLY_on (sv_cbor);
1483
1484 assert (("STRLEN must be an unsigned type", 0 <= (STRLEN)-1));
1399} 1485}
1400 1486
1401PROTOTYPES: DISABLE 1487PROTOTYPES: DISABLE
1402 1488
1403void CLONE (...) 1489void CLONE (...)
… …
1423 ALIAS: 1509 ALIAS:
1424 shrink = F_SHRINK 1510 shrink = F_SHRINK
1425 allow_unknown = F_ALLOW_UNKNOWN 1511 allow_unknown = F_ALLOW_UNKNOWN
1426 allow_sharing = F_ALLOW_SHARING 1512 allow_sharing = F_ALLOW_SHARING
1427 allow_cycles = F_ALLOW_CYCLES 1513 allow_cycles = F_ALLOW_CYCLES
1514 forbid_objects = F_FORBID_OBJECTS
1428 pack_strings = F_PACK_STRINGS 1515 pack_strings = F_PACK_STRINGS
1429 text_keys = F_TEXT_KEYS 1516 text_keys = F_TEXT_KEYS
1430 text_strings = F_TEXT_STRINGS 1517 text_strings = F_TEXT_STRINGS
1431 validate_utf8 = F_VALIDATE_UTF8 1518 validate_utf8 = F_VALIDATE_UTF8
1432 PPCODE: 1519 PPCODE:
… …
1443 ALIAS: 1530 ALIAS:
1444 get_shrink = F_SHRINK 1531 get_shrink = F_SHRINK
1445 get_allow_unknown = F_ALLOW_UNKNOWN 1532 get_allow_unknown = F_ALLOW_UNKNOWN
1446 get_allow_sharing = F_ALLOW_SHARING 1533 get_allow_sharing = F_ALLOW_SHARING
1447 get_allow_cycles = F_ALLOW_CYCLES 1534 get_allow_cycles = F_ALLOW_CYCLES
1535 get_forbid_objects = F_FORBID_OBJECTS
1448 get_pack_strings = F_PACK_STRINGS 1536 get_pack_strings = F_PACK_STRINGS
1449 get_text_keys = F_TEXT_KEYS 1537 get_text_keys = F_TEXT_KEYS
1450 get_text_strings = F_TEXT_STRINGS 1538 get_text_strings = F_TEXT_STRINGS
1451 get_validate_utf8 = F_VALIDATE_UTF8 1539 get_validate_utf8 = F_VALIDATE_UTF8
1452 PPCODE: 1540 PPCODE:
… …
1585 cbor_init (&cbor); 1673 cbor_init (&cbor);
1586 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN; 1674 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN;
1587 XPUSHs (cborstr); 1675 XPUSHs (cborstr);
1588} 1676}
1589 1677
1678#ifdef __AFL_COMPILER
1679
1680void
1681afl_init ()
1682 CODE:
1683 __AFL_INIT ();
1684
1685int
1686afl_loop (unsigned int count = 10000)
1687 CODE:
1688 RETVAL = __AFL_LOOP (count);
1689 OUTPUT:
1690 RETVAL
1691
1692#endif
1693

Diff Legend

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