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.54 by root, Sun Apr 24 20:08:41 2016 UTC vs.
Revision 1.64 by root, Tue Jun 27 02:03:24 2017 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);
… …
559 if (ecb_expect_false (nv == (NV)(U32)nv)) 563 if (ecb_expect_false (nv == (NV)(U32)nv))
560 encode_uint (enc, MAJOR_POS_INT, (U32)nv); 564 encode_uint (enc, MAJOR_POS_INT, (U32)nv);
561 //TODO: maybe I32? 565 //TODO: maybe I32?
562 else if (ecb_expect_false (nv == (float)nv)) 566 else if (ecb_expect_false (nv == (float)nv))
563 { 567 {
568 *enc->cur++ = MAJOR_MISC | MISC_FLOAT32;
569
564 uint32_t fp = ecb_float_to_binary32 (nv); 570 uint32_t fp = ecb_float_to_binary32 (nv);
565
566 *enc->cur++ = MAJOR_MISC | MISC_FLOAT32;
567 571
568 if (!ecb_big_endian ()) 572 if (!ecb_big_endian ())
569 fp = ecb_bswap32 (fp); 573 fp = ecb_bswap32 (fp);
570 574
571 memcpy (enc->cur, &fp, 4); 575 memcpy (enc->cur, &fp, 4);
572 enc->cur += 4; 576 enc->cur += 4;
573 } 577 }
574 else 578 else
575 { 579 {
580 *enc->cur++ = MAJOR_MISC | MISC_FLOAT64;
581
576 uint64_t fp = ecb_double_to_binary64 (nv); 582 uint64_t fp = ecb_double_to_binary64 (nv);
577
578 *enc->cur++ = MAJOR_MISC | MISC_FLOAT64;
579 583
580 if (!ecb_big_endian ()) 584 if (!ecb_big_endian ())
581 fp = ecb_bswap64 (fp); 585 fp = ecb_bswap64 (fp);
582 586
583 memcpy (enc->cur, &fp, 8); 587 memcpy (enc->cur, &fp, 8);
… …
621static SV * 625static SV *
622encode_cbor (SV *scalar, CBOR *cbor) 626encode_cbor (SV *scalar, CBOR *cbor)
623{ 627{
624 enc_t enc = { 0 }; 628 enc_t enc = { 0 };
625 629
626 enc.cbor = *cbor; 630 enc.cbor = *cbor;
627 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 631 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
628 enc.cur = SvPVX (enc.sv); 632 enc.cur = SvPVX (enc.sv);
629 enc.end = SvEND (enc.sv); 633 enc.end = SvEND (enc.sv);
630 634
631 SvPOK_only (enc.sv); 635 SvPOK_only (enc.sv);
632 636
633 if (cbor->flags & F_PACK_STRINGS) 637 if (cbor->flags & F_PACK_STRINGS)
634 { 638 {
… …
661 U32 depth; // recursion depth 665 U32 depth; // recursion depth
662 U32 maxdepth; // recursion depth limit 666 U32 maxdepth; // recursion depth limit
663 AV *shareable; 667 AV *shareable;
664 AV *stringref; 668 AV *stringref;
665 SV *decode_tagged; 669 SV *decode_tagged;
670 SV *err_sv; // optional sv for error, needs to be freed
666} dec_t; 671} dec_t;
667 672
668#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE 673// set dec->err to ERRSV
674ecb_cold static void
675err_errsv (dec_t *dec)
676{
677 if (!dec->err)
678 {
679 dec->err_sv = newSVsv (ERRSV);
669 680
670#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data") 681 // chop off the trailing \n
682 SvCUR_set (dec->err_sv, SvCUR (dec->err_sv) - 1);
683 *SvEND (dec->err_sv) = 0;
671 684
685 dec->err = SvPVutf8_nolen (dec->err_sv);
686 }
687}
688
689// the following functions are used to reduce code size and help the compiler to optimise
690ecb_cold static void
691err_set (dec_t *dec, const char *reason)
692{
693 if (!dec->err)
694 dec->err = reason;
695}
696
697ecb_cold static void
698err_unexpected_end (dec_t *dec)
699{
700 err_set (dec, "unexpected end of CBOR data");
701}
702
703#define ERR_DO(do) SB do; goto fail; SE
704#define ERR(reason) ERR_DO (err_set (dec, reason))
705#define ERR_ERRSV ERR_DO (err_errsv (dec))
706
707#define WANT(len) if (ecb_expect_false ((uintptr_t)(dec->end - dec->cur) < (STRLEN)len)) ERR_DO (err_unexpected_end (dec))
708
672#define DEC_INC_DEPTH if (++dec->depth > dec->cbor.max_depth) ERR (ERR_NESTING_EXCEEDED) 709#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 710#define DEC_DEC_DEPTH --dec->depth
674 711
675static UV 712static UV
676decode_uint (dec_t *dec) 713decode_uint (dec_t *dec)
677{ 714{
… …
743 780
744 for (;;) 781 for (;;)
745 { 782 {
746 WANT (1); 783 WANT (1);
747 784
748 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF)) 785 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
749 { 786 {
750 ++dec->cur; 787 ++dec->cur;
751 break; 788 break;
752 } 789 }
753 790
754 av_push (av, decode_sv (dec)); 791 av_push (av, decode_sv (dec));
755 } 792 }
756 } 793 }
757 else 794 else
758 { 795 {
759 int i, len = decode_uint (dec); 796 UV i, len = decode_uint (dec);
760 797
761 WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays 798 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); 799 av_fill (av, len - 1);
763 800
764 for (i = 0; i < len; ++i) 801 for (i = 0; i < len; ++i)
… …
767 804
768 DEC_DEC_DEPTH; 805 DEC_DEC_DEPTH;
769 return newRV_noinc ((SV *)av); 806 return newRV_noinc ((SV *)av);
770 807
771fail: 808fail:
772 SvREFCNT_dec (av); 809 SvREFCNT_dec_NN (av);
773 DEC_DEC_DEPTH; 810 DEC_DEC_DEPTH;
774 return &PL_sv_undef; 811 return &PL_sv_undef;
775} 812}
776 813
777static void 814static void
… …
781 // byte or utf-8 strings as keys, but only when !stringref 818 // byte or utf-8 strings as keys, but only when !stringref
782 819
783 if (ecb_expect_true (!dec->stringref)) 820 if (ecb_expect_true (!dec->stringref))
784 if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8)) 821 if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
785 { 822 {
786 I32 len = decode_uint (dec); 823 STRLEN len = decode_uint (dec);
787 char *key = (char *)dec->cur; 824 char *key = (char *)dec->cur;
788 825
789 WANT (len); 826 WANT (len);
790 dec->cur += len; 827 dec->cur += len;
791 828
… …
793 830
794 return; 831 return;
795 } 832 }
796 else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8)) 833 else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8))
797 { 834 {
798 I32 len = decode_uint (dec); 835 STRLEN len = decode_uint (dec);
799 char *key = (char *)dec->cur; 836 char *key = (char *)dec->cur;
800 837
801 WANT (len); 838 WANT (len);
802 dec->cur += len; 839 dec->cur += len;
803 840
… …
811 } 848 }
812 849
813 SV *k = decode_sv (dec); 850 SV *k = decode_sv (dec);
814 SV *v = decode_sv (dec); 851 SV *v = decode_sv (dec);
815 852
853 // we leak memory if uncaught exceptions are thrown by random magical
854 // methods, and this is hopefully the only place where it can happen,
855 // so if there is a chance of an exception, take the very slow path.
856 // since catching exceptions is "undocumented/internal/forbidden" by
857 // the new p5p powers, we need to call out to a perl function :/
858 if (ecb_expect_false (SvAMAGIC (k)))
859 {
860 dSP;
861
862 ENTER; SAVETMPS;
863 PUSHMARK (SP);
864 EXTEND (SP, 3);
865 PUSHs (sv_2mortal (newRV_inc ((SV *)hv)));
866 PUSHs (sv_2mortal (k));
867 PUSHs (sv_2mortal (v));
868
869 PUTBACK;
870 call_pv ("CBOR::XS::_hv_store", G_VOID | G_DISCARD | G_EVAL);
871 SPAGAIN;
872
873 FREETMPS; LEAVE;
874
875 if (SvTRUE (ERRSV))
876 ERR_ERRSV;
877
878 return;
879 }
880
816 hv_store_ent (hv, k, v, 0); 881 hv_store_ent (hv, k, v, 0);
817 SvREFCNT_dec (k); 882 SvREFCNT_dec_NN (k);
818 883
819fail: 884fail:
820 ; 885 ;
821} 886}
822 887
… …
833 898
834 for (;;) 899 for (;;)
835 { 900 {
836 WANT (1); 901 WANT (1);
837 902
838 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF)) 903 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
839 { 904 {
840 ++dec->cur; 905 ++dec->cur;
841 break; 906 break;
842 } 907 }
843 908
844 decode_he (dec, hv); 909 decode_he (dec, hv);
845 } 910 }
846 } 911 }
847 else 912 else
848 { 913 {
849 int pairs = decode_uint (dec); 914 UV pairs = decode_uint (dec);
915
916 WANT (pairs); // complexity check - need at least one byte per value, do not allow supersize hashes
850 917
851 while (pairs--) 918 while (pairs--)
852 decode_he (dec, hv); 919 decode_he (dec, hv);
853 } 920 }
854 921
855 DEC_DEC_DEPTH; 922 DEC_DEC_DEPTH;
856 return newRV_noinc ((SV *)hv); 923 return newRV_noinc ((SV *)hv);
857 924
858fail: 925fail:
859 SvREFCNT_dec (hv); 926 SvREFCNT_dec_NN (hv);
860 DEC_DEC_DEPTH; 927 DEC_DEC_DEPTH;
861 return &PL_sv_undef; 928 return &PL_sv_undef;
862} 929}
863 930
864static SV * 931static SV *
865decode_str (dec_t *dec, int utf8) 932decode_str (dec_t *dec, int utf8)
866{ 933{
867 SV *sv = 0; 934 SV *sv = 0;
868 935
869 if ((*dec->cur & MINOR_MASK) == MINOR_INDEF) 936 if (ecb_expect_false ((*dec->cur & MINOR_MASK) == MINOR_INDEF))
870 { 937 {
871 // indefinite length strings 938 // indefinite length strings
872 ++dec->cur; 939 ++dec->cur;
873 940
874 U8 major = *dec->cur & MAJOR_MISC; 941 U8 major = *dec->cur & MAJOR_MISC;
… …
942 sv = newRV_noinc (decode_sv (dec)); 1009 sv = newRV_noinc (decode_sv (dec));
943 break; 1010 break;
944 1011
945 case CBOR_TAG_STRINGREF_NAMESPACE: 1012 case CBOR_TAG_STRINGREF_NAMESPACE:
946 { 1013 {
1014 // do not use SAVETMPS/FREETMPS, as these will
1015 // erase mortalised caches, e.g. "shareable"
947 ENTER; SAVETMPS; 1016 ENTER;
948 1017
949 SAVESPTR (dec->stringref); 1018 SAVESPTR (dec->stringref);
950 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ()); 1019 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ());
951 1020
952 sv = decode_sv (dec); 1021 sv = decode_sv (dec);
953 1022
954 FREETMPS; LEAVE; 1023 LEAVE;
955 } 1024 }
956 break; 1025 break;
957 1026
958 case CBOR_TAG_STRINGREF: 1027 case CBOR_TAG_STRINGREF:
959 { 1028 {
960 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT)) 1029 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
961 ERR ("corrupted CBOR data (stringref index not an unsigned integer)"); 1030 ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
962 1031
963 UV idx = decode_uint (dec); 1032 UV idx = decode_uint (dec);
964 1033
965 if (!dec->stringref || (int)idx > AvFILLp (dec->stringref)) 1034 if (!dec->stringref || idx >= (UV)(1 + AvFILLp (dec->stringref)))
966 ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)"); 1035 ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)");
967 1036
968 sv = newSVsv (AvARRAY (dec->stringref)[idx]); 1037 sv = newSVsv (AvARRAY (dec->stringref)[idx]);
969 } 1038 }
970 break; 1039 break;
… …
998 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT)) 1067 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
999 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)"); 1068 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
1000 1069
1001 UV idx = decode_uint (dec); 1070 UV idx = decode_uint (dec);
1002 1071
1003 if (!dec->shareable || (int)idx > AvFILLp (dec->shareable)) 1072 if (!dec->shareable || idx >= (UV)(1 + AvFILLp (dec->shareable)))
1004 ERR ("corrupted CBOR data (sharedref index out of bounds)"); 1073 ERR ("corrupted CBOR data (sharedref index out of bounds)");
1005 1074
1006 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]); 1075 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
1007 1076
1008 if (sv == &PL_sv_undef) 1077 if (sv == &PL_sv_undef)
… …
1010 } 1079 }
1011 break; 1080 break;
1012 1081
1013 case CBOR_TAG_PERL_OBJECT: 1082 case CBOR_TAG_PERL_OBJECT:
1014 { 1083 {
1084 if (dec->cbor.flags & F_FORBID_OBJECTS)
1085 goto filter;
1086
1015 sv = decode_sv (dec); 1087 sv = decode_sv (dec);
1016 1088
1017 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV) 1089 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
1018 ERR ("corrupted CBOR data (non-array perl object)"); 1090 ERR ("corrupted CBOR data (non-array perl object)");
1019 1091
… …
1048 SPAGAIN; 1120 SPAGAIN;
1049 1121
1050 if (SvTRUE (ERRSV)) 1122 if (SvTRUE (ERRSV))
1051 { 1123 {
1052 FREETMPS; LEAVE; 1124 FREETMPS; LEAVE;
1053 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); 1125 ERR_ERRSV;
1054 } 1126 }
1055 1127
1056 SvREFCNT_dec (sv); 1128 SvREFCNT_dec_NN (sv);
1057 sv = SvREFCNT_inc (POPs); 1129 sv = SvREFCNT_inc (POPs);
1058 1130
1059 PUTBACK; 1131 PUTBACK;
1060 1132
1061 FREETMPS; LEAVE; 1133 FREETMPS; LEAVE;
1062 } 1134 }
1063 break; 1135 break;
1064 1136
1065 default: 1137 default:
1138 filter:
1066 { 1139 {
1140 SV *tag_sv = newSVuv (tag);
1141
1067 sv = decode_sv (dec); 1142 sv = decode_sv (dec);
1068 1143
1069 dSP; 1144 dSP;
1070 ENTER; SAVETMPS; 1145 ENTER; SAVETMPS;
1071 SAVESTACK_POS (); 1146 SAVESTACK_POS ();
1072 PUSHMARK (SP); 1147 PUSHMARK (SP);
1073 EXTEND (SP, 2); 1148 EXTEND (SP, 2);
1074 PUSHs (newSVuv (tag)); 1149 PUSHs (tag_sv);
1075 PUSHs (sv); 1150 PUSHs (sv);
1076 1151
1077 PUTBACK; 1152 PUTBACK;
1078 int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL); 1153 int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL);
1079 SPAGAIN; 1154 SPAGAIN;
1080 1155
1081 if (SvTRUE (ERRSV)) 1156 if (SvTRUE (ERRSV))
1082 { 1157 {
1158 SvREFCNT_dec_NN (tag_sv);
1083 FREETMPS; LEAVE; 1159 FREETMPS; LEAVE;
1084 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); 1160 ERR_ERRSV;
1085 } 1161 }
1086 1162
1087 if (count) 1163 if (count)
1088 { 1164 {
1165 SvREFCNT_dec_NN (tag_sv);
1089 SvREFCNT_dec (sv); 1166 SvREFCNT_dec_NN (sv);
1090 sv = SvREFCNT_inc (POPs); 1167 sv = SvREFCNT_inc_NN (POPs);
1091 } 1168 }
1092 else 1169 else
1093 { 1170 {
1094 AV *av = newAV (); 1171 AV *av = newAV ();
1095 av_push (av, newSVuv (tag)); 1172 av_push (av, tag_sv);
1096 av_push (av, sv); 1173 av_push (av, sv);
1097 1174
1098 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 1175 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
1099 ? cbor_tagged_stash 1176 ? cbor_tagged_stash
1100 : gv_stashpv ("CBOR::XS::Tagged" , 1); 1177 : gv_stashpv ("CBOR::XS::Tagged" , 1);
… …
1229 1306
1230 if (dec.err) 1307 if (dec.err)
1231 { 1308 {
1232 if (dec.shareable) 1309 if (dec.shareable)
1233 { 1310 {
1234 // need to break cyclic links, which whould all be in shareable 1311 // need to break cyclic links, which would all be in shareable
1235 int i; 1312 int i;
1236 SV **svp; 1313 SV **svp;
1237 1314
1238 for (i = av_len (dec.shareable) + 1; i--; ) 1315 for (i = av_len (dec.shareable) + 1; i--; )
1239 if ((svp = av_fetch (dec.shareable, i, 0))) 1316 if ((svp = av_fetch (dec.shareable, i, 0)))
1240 sv_setsv (*svp, &PL_sv_undef); 1317 sv_setsv (*svp, &PL_sv_undef);
1241 } 1318 }
1242 1319
1243 SvREFCNT_dec (sv); 1320 SvREFCNT_dec_NN (sv);
1321
1322 if (dec.err_sv)
1323 sv_2mortal (dec.err_sv);
1324
1244 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur); 1325 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur);
1245 } 1326 }
1246 1327
1247 sv = sv_2mortal (sv); 1328 sv = sv_2mortal (sv);
1248 1329
… …
1392 1473
1393 default_filter = newSVpv ("CBOR::XS::default_filter", 0); 1474 default_filter = newSVpv ("CBOR::XS::default_filter", 0);
1394 1475
1395 sv_cbor = newSVpv ("CBOR", 0); 1476 sv_cbor = newSVpv ("CBOR", 0);
1396 SvREADONLY_on (sv_cbor); 1477 SvREADONLY_on (sv_cbor);
1478
1479 assert (("STRLEN must be an unsigned type", 0 <= (STRLEN)-1));
1397} 1480}
1398 1481
1399PROTOTYPES: DISABLE 1482PROTOTYPES: DISABLE
1400 1483
1401void CLONE (...) 1484void CLONE (...)
… …
1421 ALIAS: 1504 ALIAS:
1422 shrink = F_SHRINK 1505 shrink = F_SHRINK
1423 allow_unknown = F_ALLOW_UNKNOWN 1506 allow_unknown = F_ALLOW_UNKNOWN
1424 allow_sharing = F_ALLOW_SHARING 1507 allow_sharing = F_ALLOW_SHARING
1425 allow_cycles = F_ALLOW_CYCLES 1508 allow_cycles = F_ALLOW_CYCLES
1509 forbid_objects = F_FORBID_OBJECTS
1426 pack_strings = F_PACK_STRINGS 1510 pack_strings = F_PACK_STRINGS
1427 text_keys = F_TEXT_KEYS 1511 text_keys = F_TEXT_KEYS
1428 text_strings = F_TEXT_STRINGS 1512 text_strings = F_TEXT_STRINGS
1429 validate_utf8 = F_VALIDATE_UTF8 1513 validate_utf8 = F_VALIDATE_UTF8
1430 PPCODE: 1514 PPCODE:
… …
1441 ALIAS: 1525 ALIAS:
1442 get_shrink = F_SHRINK 1526 get_shrink = F_SHRINK
1443 get_allow_unknown = F_ALLOW_UNKNOWN 1527 get_allow_unknown = F_ALLOW_UNKNOWN
1444 get_allow_sharing = F_ALLOW_SHARING 1528 get_allow_sharing = F_ALLOW_SHARING
1445 get_allow_cycles = F_ALLOW_CYCLES 1529 get_allow_cycles = F_ALLOW_CYCLES
1530 get_forbid_objects = F_FORBID_OBJECTS
1446 get_pack_strings = F_PACK_STRINGS 1531 get_pack_strings = F_PACK_STRINGS
1447 get_text_keys = F_TEXT_KEYS 1532 get_text_keys = F_TEXT_KEYS
1448 get_text_strings = F_TEXT_STRINGS 1533 get_text_strings = F_TEXT_STRINGS
1449 get_validate_utf8 = F_VALIDATE_UTF8 1534 get_validate_utf8 = F_VALIDATE_UTF8
1450 PPCODE: 1535 PPCODE:
… …
1583 cbor_init (&cbor); 1668 cbor_init (&cbor);
1584 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN; 1669 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN;
1585 XPUSHs (cborstr); 1670 XPUSHs (cborstr);
1586} 1671}
1587 1672
1673#ifdef __AFL_COMPILER
1674
1675void
1676afl_init ()
1677 CODE:
1678 __AFL_INIT ();
1679
1680int
1681afl_loop (unsigned int count = 10000)
1682 CODE:
1683 RETVAL = __AFL_LOOP (count);
1684 OUTPUT:
1685 RETVAL
1686
1687#endif
1688

Diff Legend

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