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

Comparing cvsroot/CBOR-XS/XS.xs (file contents):
Revision 1.61 by root, Sat Nov 26 02:10:19 2016 UTC vs.
Revision 1.68 by root, Mon Nov 30 18:30:29 2020 UTC

… …
21# define HvNAMELEN(hv) HvNAMELEN_get (hv) 21# define HvNAMELEN(hv) HvNAMELEN_get (hv)
22#endif 22#endif
23#ifndef HvNAMEUTF8 23#ifndef HvNAMEUTF8
24# define HvNAMEUTF8(hv) 0 24# define HvNAMEUTF8(hv) 0
25#endif 25#endif
26#ifndef SvREFCNT_inc_NN
27# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
28#endif
26#ifndef SvREFCNT_dec_NN 29#ifndef SvREFCNT_dec_NN
27# define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv) 30# define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
28#endif 31#endif
29 32
30// known major and minor types 33// known major and minor types
… …
94 CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8 97 CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8
95 CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8 98 CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8
96 CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8 99 CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
97 100
98 CBOR_TAG_MAGIC = 55799, // self-describe cbor 101 CBOR_TAG_MAGIC = 55799, // self-describe cbor
102};
103
104// known forced types, also hardcoded in CBOR.pm
105enum
106{
107 AS_CBOR = 0,
108 AS_INT = 1,
109 AS_BYTES = 2,
110 AS_TEXT = 3,
111 AS_FLOAT16 = 4,
112 AS_FLOAT32 = 5,
113 AS_FLOAT64 = 6,
114 // possibly future enhancements: (generic) float, (generic) string
99}; 115};
100 116
101#define F_SHRINK 0x00000001UL 117#define F_SHRINK 0x00000001UL
102#define F_ALLOW_UNKNOWN 0x00000002UL 118#define F_ALLOW_UNKNOWN 0x00000002UL
103#define F_ALLOW_SHARING 0x00000004UL 119#define F_ALLOW_SHARING 0x00000004UL
… …
187 203
188// minimum length of a string to be registered for stringref 204// minimum length of a string to be registered for stringref
189ecb_inline int 205ecb_inline int
190minimum_string_length (UV idx) 206minimum_string_length (UV idx)
191{ 207{
192
193 return idx <= 23 ? 3 208 return idx <= 23 ? 3
194 : idx <= 0xffU ? 4 209 : idx <= 0xffU ? 4
195 : idx <= 0xffffU ? 5 210 : idx <= 0xffffU ? 5
196 : idx <= 0xffffffffU ? 7 211 : idx <= 0xffffffffU ? 7
197 : 11; 212 : 11;
… …
231{ 246{
232 need (enc, 1); 247 need (enc, 1);
233 *enc->cur++ = ch; 248 *enc->cur++ = ch;
234} 249}
235 250
251// used for tags, intregers, element counts and so on
236static void 252static void
237encode_uint (enc_t *enc, int major, UV len) 253encode_uint (enc_t *enc, int major, UV len)
238{ 254{
239 need (enc, 9); 255 need (enc, 9);
240 256
… …
271 *enc->cur++ = len >> 8; 287 *enc->cur++ = len >> 8;
272 *enc->cur++ = len; 288 *enc->cur++ = len;
273 } 289 }
274} 290}
275 291
292// encodes a perl value into a CBOR integer
293ecb_inline void
294encode_int (enc_t *enc, SV *sv)
295{
296 if (SvIsUV (sv))
297 encode_uint (enc, MAJOR_POS_INT, SvUVX (sv));
298 else if (SvIVX (sv) >= 0)
299 encode_uint (enc, MAJOR_POS_INT, SvIVX (sv));
300 else
301 encode_uint (enc, MAJOR_NEG_INT, -(SvIVX (sv) + 1));
302}
303
276ecb_inline void 304ecb_inline void
277encode_tag (enc_t *enc, UV tag) 305encode_tag (enc_t *enc, UV tag)
278{ 306{
279 encode_uint (enc, MAJOR_TAG, tag); 307 encode_uint (enc, MAJOR_TAG, tag);
280} 308}
… …
341 } 369 }
342 370
343 encode_str (enc, upgrade_utf8, utf8, str, len); 371 encode_str (enc, upgrade_utf8, utf8, str, len);
344} 372}
345 373
374ecb_inline void
375encode_float16 (enc_t *enc, NV nv)
376{
377 need (enc, 1+2);
378
379 *enc->cur++ = MAJOR_MISC | MISC_FLOAT16;
380
381 uint16_t fp = ecb_float_to_binary16 (nv);
382
383 if (!ecb_big_endian ())
384 fp = ecb_bswap16 (fp);
385
386 memcpy (enc->cur, &fp, 2);
387 enc->cur += 2;
388}
389
390ecb_inline void
391encode_float32 (enc_t *enc, NV nv)
392{
393 need (enc, 1+4);
394
395 *enc->cur++ = MAJOR_MISC | MISC_FLOAT32;
396
397 uint32_t fp = ecb_float_to_binary32 (nv);
398
399 if (!ecb_big_endian ())
400 fp = ecb_bswap32 (fp);
401
402 memcpy (enc->cur, &fp, 4);
403 enc->cur += 4;
404}
405
406ecb_inline void
407encode_float64 (enc_t *enc, NV nv)
408{
409 need (enc, 1+8);
410
411 *enc->cur++ = MAJOR_MISC | MISC_FLOAT64;
412
413 uint64_t fp = ecb_double_to_binary64 (nv);
414
415 if (!ecb_big_endian ())
416 fp = ecb_bswap64 (fp);
417
418 memcpy (enc->cur, &fp, 8);
419 enc->cur += 8;
420}
421
422ecb_inline void
423encode_forced (enc_t *enc, UV type, SV *sv)
424{
425 switch (type)
426 {
427 case AS_CBOR:
428 {
429 STRLEN len;
430 char *str = SvPVbyte (sv, len);
431
432 need (enc, len);
433 memcpy (enc->cur, str, len);
434 enc->cur += len;
435 }
436 break;
437
438 case AS_BYTES:
439 {
440 STRLEN len;
441 char *str = SvPVbyte (sv, len);
442 encode_strref (enc, 0, 0, str, len);
443 }
444 break;
445
446 case AS_TEXT:
447 {
448 STRLEN len;
449 char *str = SvPVutf8 (sv, len);
450 encode_strref (enc, 1, 1, str, len);
451 }
452 break;
453
454 case AS_INT: encode_int (enc, sv); break;
455 case AS_FLOAT16: encode_float16 (enc, SvNV (sv)); break;
456 case AS_FLOAT32: encode_float32 (enc, SvNV (sv)); break;
457 case AS_FLOAT64: encode_float64 (enc, SvNV (sv)); break;
458
459 default:
460 croak ("encountered malformed CBOR::XS::Tagged object");
461 }
462}
463
346static void encode_sv (enc_t *enc, SV *sv); 464static void encode_sv (enc_t *enc, SV *sv);
347 465
348static void 466static void
349encode_av (enc_t *enc, AV *av) 467encode_av (enc_t *enc, AV *av)
350{ 468{
… …
355 473
356 ++enc->depth; 474 ++enc->depth;
357 475
358 encode_uint (enc, MAJOR_ARRAY, len + 1); 476 encode_uint (enc, MAJOR_ARRAY, len + 1);
359 477
360 if (SvMAGICAL (av)) 478 if (ecb_expect_false (SvMAGICAL (av)))
361 for (i = 0; i <= len; ++i) 479 for (i = 0; i <= len; ++i)
362 { 480 {
363 SV **svp = av_fetch (av, i, 0); 481 SV **svp = av_fetch (av, i, 0);
364 encode_sv (enc, svp ? *svp : &PL_sv_undef); 482 encode_sv (enc, svp ? *svp : &PL_sv_undef);
365 } 483 }
… …
384 ++enc->depth; 502 ++enc->depth;
385 503
386 int pairs = hv_iterinit (hv); 504 int pairs = hv_iterinit (hv);
387 int mg = SvMAGICAL (hv); 505 int mg = SvMAGICAL (hv);
388 506
389 if (mg) 507 if (ecb_expect_false (mg))
390 encode_ch (enc, MAJOR_MAP | MINOR_INDEF); 508 encode_ch (enc, MAJOR_MAP | MINOR_INDEF);
391 else 509 else
392 encode_uint (enc, MAJOR_MAP, pairs); 510 encode_uint (enc, MAJOR_MAP, pairs);
393 511
394 while ((he = hv_iternext (hv))) 512 while ((he = hv_iternext (hv)))
… …
399 encode_strref (enc, enc->cbor.flags & (F_TEXT_KEYS | F_TEXT_STRINGS), HeKUTF8 (he), HeKEY (he), HeKLEN (he)); 517 encode_strref (enc, enc->cbor.flags & (F_TEXT_KEYS | F_TEXT_STRINGS), HeKUTF8 (he), HeKEY (he), HeKLEN (he));
400 518
401 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he)); 519 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));
402 } 520 }
403 521
404 if (mg) 522 if (ecb_expect_false (mg))
405 encode_ch (enc, MAJOR_MISC | MINOR_INDEF); 523 encode_ch (enc, MAJOR_MISC | MINOR_INDEF);
406 524
407 --enc->depth; 525 --enc->depth;
408} 526}
409 527
… …
442 else if (stash == tagged_stash) 560 else if (stash == tagged_stash)
443 { 561 {
444 if (svt != SVt_PVAV) 562 if (svt != SVt_PVAV)
445 croak ("encountered CBOR::XS::Tagged object that isn't an array"); 563 croak ("encountered CBOR::XS::Tagged object that isn't an array");
446 564
565 switch (av_len ((AV *)sv))
566 {
567 case 2-1:
568 // actually a tagged value
447 encode_uint (enc, MAJOR_TAG, SvUV (*av_fetch ((AV *)sv, 0, 1))); 569 encode_uint (enc, MAJOR_TAG, SvUV (*av_fetch ((AV *)sv, 0, 1)));
448 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1)); 570 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1));
571 break;
572
573 case 3-1:
574 // a forced type [value, type, undef]
575 encode_forced (enc, SvUV (*av_fetch ((AV *)sv, 1, 1)), *av_fetch ((AV *)sv, 0, 1));
576 break;
577
578 default:
579 croak ("encountered malformed CBOR::XS::Tagged object");
580 }
449 581
450 return; 582 return;
451 } 583 }
452 } 584 }
453 585
454 if (ecb_expect_false (SvREFCNT (sv) > 1) 586 if (ecb_expect_false (SvREFCNT (sv) > 1)
455 && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)) 587 && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING))
456 { 588 {
457 if (!enc->shareable) 589 if (ecb_expect_false (!enc->shareable))
458 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ()); 590 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ());
459 591
460 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1); 592 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1);
461 593
462 if (SvOK (*svp)) 594 if (SvOK (*svp))
… …
508 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0) 640 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
509 { 641 {
510 dSP; 642 dSP;
511 643
512 ENTER; SAVETMPS; 644 ENTER; SAVETMPS;
513 SAVESTACK_POS ();
514 PUSHMARK (SP); 645 PUSHMARK (SP);
515 EXTEND (SP, 2); 646 EXTEND (SP, 2);
516 // we re-bless the reference to get overload and other niceties right 647 // we re-bless the reference to get overload and other niceties right
517 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 648 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
518 PUSHs (sv_cbor); 649 PUSHs (sv_cbor);
… …
527 658
528 encode_tag (enc, CBOR_TAG_PERL_OBJECT); 659 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
529 encode_uint (enc, MAJOR_ARRAY, count + 1); 660 encode_uint (enc, MAJOR_ARRAY, count + 1);
530 encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash)); 661 encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
531 662
532 while (count) 663 {
664 int i;
665
666 for (i = 0; i < count; ++i)
533 encode_sv (enc, SP[1 - count--]); 667 encode_sv (enc, SP[i + 1 - count]);
668
669 SP -= count;
670 }
534 671
535 PUTBACK; 672 PUTBACK;
536 673
537 FREETMPS; LEAVE; 674 FREETMPS; LEAVE;
538 } 675 }
… …
560 697
561 if (ecb_expect_false (nv == (NV)(U32)nv)) 698 if (ecb_expect_false (nv == (NV)(U32)nv))
562 encode_uint (enc, MAJOR_POS_INT, (U32)nv); 699 encode_uint (enc, MAJOR_POS_INT, (U32)nv);
563 //TODO: maybe I32? 700 //TODO: maybe I32?
564 else if (ecb_expect_false (nv == (float)nv)) 701 else if (ecb_expect_false (nv == (float)nv))
565 { 702 encode_float32 (enc, nv);
566 uint32_t fp = ecb_float_to_binary32 (nv);
567
568 *enc->cur++ = MAJOR_MISC | MISC_FLOAT32;
569
570 if (!ecb_big_endian ())
571 fp = ecb_bswap32 (fp);
572
573 memcpy (enc->cur, &fp, 4);
574 enc->cur += 4;
575 }
576 else 703 else
577 { 704 encode_float64 (enc, nv);
578 uint64_t fp = ecb_double_to_binary64 (nv);
579
580 *enc->cur++ = MAJOR_MISC | MISC_FLOAT64;
581
582 if (!ecb_big_endian ())
583 fp = ecb_bswap64 (fp);
584
585 memcpy (enc->cur, &fp, 8);
586 enc->cur += 8;
587 }
588} 705}
589 706
590static void 707static void
591encode_sv (enc_t *enc, SV *sv) 708encode_sv (enc_t *enc, SV *sv)
592{ 709{
… …
599 encode_strref (enc, enc->cbor.flags & F_TEXT_STRINGS, SvUTF8 (sv), str, len); 716 encode_strref (enc, enc->cbor.flags & F_TEXT_STRINGS, SvUTF8 (sv), str, len);
600 } 717 }
601 else if (SvNOKp (sv)) 718 else if (SvNOKp (sv))
602 encode_nv (enc, sv); 719 encode_nv (enc, sv);
603 else if (SvIOKp (sv)) 720 else if (SvIOKp (sv))
604 { 721 encode_int (enc, sv);
605 if (SvIsUV (sv))
606 encode_uint (enc, MAJOR_POS_INT, SvUVX (sv));
607 else if (SvIVX (sv) >= 0)
608 encode_uint (enc, MAJOR_POS_INT, SvIVX (sv));
609 else
610 encode_uint (enc, MAJOR_NEG_INT, -(SvIVX (sv) + 1));
611 }
612 else if (SvROK (sv)) 722 else if (SvROK (sv))
613 encode_rv (enc, SvRV (sv)); 723 encode_rv (enc, SvRV (sv));
614 else if (!SvOK (sv)) 724 else if (!SvOK (sv))
615 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL); 725 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL);
616 else if (enc->cbor.flags & F_ALLOW_UNKNOWN) 726 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
… …
623static SV * 733static SV *
624encode_cbor (SV *scalar, CBOR *cbor) 734encode_cbor (SV *scalar, CBOR *cbor)
625{ 735{
626 enc_t enc = { 0 }; 736 enc_t enc = { 0 };
627 737
628 enc.cbor = *cbor; 738 enc.cbor = *cbor;
629 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 739 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
630 enc.cur = SvPVX (enc.sv); 740 enc.cur = SvPVX (enc.sv);
631 enc.end = SvEND (enc.sv); 741 enc.end = SvEND (enc.sv);
632 742
633 SvPOK_only (enc.sv); 743 SvPOK_only (enc.sv);
634 744
635 if (cbor->flags & F_PACK_STRINGS) 745 if (cbor->flags & F_PACK_STRINGS)
636 { 746 {
… …
694 804
695ecb_cold static void 805ecb_cold static void
696err_unexpected_end (dec_t *dec) 806err_unexpected_end (dec_t *dec)
697{ 807{
698 err_set (dec, "unexpected end of CBOR data"); 808 err_set (dec, "unexpected end of CBOR data");
699}
700
701ecb_cold static void
702err_nesting_exceeded (dec_t *dec)
703{
704 err_set (dec, ERR_NESTING_EXCEEDED);
705} 809}
706 810
707#define ERR_DO(do) SB do; goto fail; SE 811#define ERR_DO(do) SB do; goto fail; SE
708#define ERR(reason) ERR_DO (err_set (dec, reason)) 812#define ERR(reason) ERR_DO (err_set (dec, reason))
709#define ERR_ERRSV ERR_DO (err_errsv (dec)) 813#define ERR_ERRSV ERR_DO (err_errsv (dec))
… …
784 888
785 for (;;) 889 for (;;)
786 { 890 {
787 WANT (1); 891 WANT (1);
788 892
789 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF)) 893 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
790 { 894 {
791 ++dec->cur; 895 ++dec->cur;
792 break; 896 break;
793 } 897 }
794 898
… …
808 912
809 DEC_DEC_DEPTH; 913 DEC_DEC_DEPTH;
810 return newRV_noinc ((SV *)av); 914 return newRV_noinc ((SV *)av);
811 915
812fail: 916fail:
813 SvREFCNT_dec (av); 917 SvREFCNT_dec_NN (av);
814 DEC_DEC_DEPTH; 918 DEC_DEC_DEPTH;
815 return &PL_sv_undef; 919 return &PL_sv_undef;
816} 920}
817 921
818static void 922static void
… …
881 985
882 return; 986 return;
883 } 987 }
884 988
885 hv_store_ent (hv, k, v, 0); 989 hv_store_ent (hv, k, v, 0);
886 SvREFCNT_dec (k); 990 SvREFCNT_dec_NN (k);
887 991
888fail: 992fail:
889 ; 993 ;
890} 994}
891 995
… …
902 1006
903 for (;;) 1007 for (;;)
904 { 1008 {
905 WANT (1); 1009 WANT (1);
906 1010
907 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF)) 1011 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
908 { 1012 {
909 ++dec->cur; 1013 ++dec->cur;
910 break; 1014 break;
911 } 1015 }
912 1016
… …
925 1029
926 DEC_DEC_DEPTH; 1030 DEC_DEC_DEPTH;
927 return newRV_noinc ((SV *)hv); 1031 return newRV_noinc ((SV *)hv);
928 1032
929fail: 1033fail:
930 SvREFCNT_dec (hv); 1034 SvREFCNT_dec_NN (hv);
931 DEC_DEC_DEPTH; 1035 DEC_DEC_DEPTH;
932 return &PL_sv_undef; 1036 return &PL_sv_undef;
933} 1037}
934 1038
935static SV * 1039static SV *
936decode_str (dec_t *dec, int utf8) 1040decode_str (dec_t *dec, int utf8)
937{ 1041{
938 SV *sv = 0; 1042 SV *sv = 0;
939 1043
940 if ((*dec->cur & MINOR_MASK) == MINOR_INDEF) 1044 if (ecb_expect_false ((*dec->cur & MINOR_MASK) == MINOR_INDEF))
941 { 1045 {
942 // indefinite length strings 1046 // indefinite length strings
943 ++dec->cur; 1047 ++dec->cur;
944 1048
945 U8 major = *dec->cur & MAJOR_MISC; 1049 U8 major = *dec->cur & MAJOR_MISC;
… …
1013 sv = newRV_noinc (decode_sv (dec)); 1117 sv = newRV_noinc (decode_sv (dec));
1014 break; 1118 break;
1015 1119
1016 case CBOR_TAG_STRINGREF_NAMESPACE: 1120 case CBOR_TAG_STRINGREF_NAMESPACE:
1017 { 1121 {
1018 // do nmot use SAVETMPS/FREETMPS, as these will 1122 // do not use SAVETMPS/FREETMPS, as these will
1019 // erase mortalised caches, e.g. "shareable" 1123 // erase mortalised caches, e.g. "shareable"
1020 ENTER; 1124 ENTER;
1021 1125
1022 SAVESPTR (dec->stringref); 1126 SAVESPTR (dec->stringref);
1023 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ()); 1127 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ());
… …
1033 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT)) 1137 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
1034 ERR ("corrupted CBOR data (stringref index not an unsigned integer)"); 1138 ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
1035 1139
1036 UV idx = decode_uint (dec); 1140 UV idx = decode_uint (dec);
1037 1141
1038 if (!dec->stringref || (int)idx > AvFILLp (dec->stringref)) 1142 if (!dec->stringref || idx >= (UV)(1 + AvFILLp (dec->stringref)))
1039 ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)"); 1143 ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)");
1040 1144
1041 sv = newSVsv (AvARRAY (dec->stringref)[idx]); 1145 sv = newSVsv (AvARRAY (dec->stringref)[idx]);
1042 } 1146 }
1043 break; 1147 break;
… …
1071 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT)) 1175 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
1072 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)"); 1176 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
1073 1177
1074 UV idx = decode_uint (dec); 1178 UV idx = decode_uint (dec);
1075 1179
1076 if (!dec->shareable || (int)idx > AvFILLp (dec->shareable)) 1180 if (!dec->shareable || idx >= (UV)(1 + AvFILLp (dec->shareable)))
1077 ERR ("corrupted CBOR data (sharedref index out of bounds)"); 1181 ERR ("corrupted CBOR data (sharedref index out of bounds)");
1078 1182
1079 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]); 1183 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
1080 1184
1081 if (sv == &PL_sv_undef) 1185 if (sv == &PL_sv_undef)
… …
1127 { 1231 {
1128 FREETMPS; LEAVE; 1232 FREETMPS; LEAVE;
1129 ERR_ERRSV; 1233 ERR_ERRSV;
1130 } 1234 }
1131 1235
1132 SvREFCNT_dec (sv); 1236 SvREFCNT_dec_NN (sv);
1133 sv = SvREFCNT_inc (POPs); 1237 sv = SvREFCNT_inc (POPs);
1134 1238
1135 PUTBACK; 1239 PUTBACK;
1136 1240
1137 FREETMPS; LEAVE; 1241 FREETMPS; LEAVE;
… …
1145 1249
1146 sv = decode_sv (dec); 1250 sv = decode_sv (dec);
1147 1251
1148 dSP; 1252 dSP;
1149 ENTER; SAVETMPS; 1253 ENTER; SAVETMPS;
1150 SAVESTACK_POS ();
1151 PUSHMARK (SP); 1254 PUSHMARK (SP);
1152 EXTEND (SP, 2); 1255 EXTEND (SP, 2);
1153 PUSHs (tag_sv); 1256 PUSHs (tag_sv);
1154 PUSHs (sv); 1257 PUSHs (sv);
1155 1258
… …
1157 int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL); 1260 int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL);
1158 SPAGAIN; 1261 SPAGAIN;
1159 1262
1160 if (SvTRUE (ERRSV)) 1263 if (SvTRUE (ERRSV))
1161 { 1264 {
1162 SvREFCNT_dec (tag_sv); 1265 SvREFCNT_dec_NN (tag_sv);
1163 FREETMPS; LEAVE; 1266 FREETMPS; LEAVE;
1164 ERR_ERRSV; 1267 ERR_ERRSV;
1165 } 1268 }
1166 1269
1167 if (count) 1270 if (count)
1168 { 1271 {
1169 SvREFCNT_dec (tag_sv); 1272 SvREFCNT_dec_NN (tag_sv);
1170 SvREFCNT_dec (sv); 1273 SvREFCNT_dec_NN (sv);
1171 sv = SvREFCNT_inc (POPs); 1274 sv = SvREFCNT_inc_NN (TOPs);
1275 SP -= count;
1172 } 1276 }
1173 else 1277 else
1174 { 1278 {
1175 AV *av = newAV (); 1279 AV *av = newAV ();
1176 av_push (av, tag_sv); 1280 av_push (av, tag_sv);
… …
1319 for (i = av_len (dec.shareable) + 1; i--; ) 1423 for (i = av_len (dec.shareable) + 1; i--; )
1320 if ((svp = av_fetch (dec.shareable, i, 0))) 1424 if ((svp = av_fetch (dec.shareable, i, 0)))
1321 sv_setsv (*svp, &PL_sv_undef); 1425 sv_setsv (*svp, &PL_sv_undef);
1322 } 1426 }
1323 1427
1324 SvREFCNT_dec (sv); 1428 SvREFCNT_dec_NN (sv);
1325 1429
1326 if (dec.err_sv) 1430 if (dec.err_sv)
1327 sv_2mortal (dec.err_sv); 1431 sv_2mortal (dec.err_sv);
1328 1432
1329 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur); 1433 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur);
… …
1672 cbor_init (&cbor); 1776 cbor_init (&cbor);
1673 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN; 1777 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN;
1674 XPUSHs (cborstr); 1778 XPUSHs (cborstr);
1675} 1779}
1676 1780
1781#ifdef __AFL_COMPILER
1782
1783void
1784afl_init ()
1785 CODE:
1786 __AFL_INIT ();
1787
1788int
1789afl_loop (unsigned int count = 10000)
1790 CODE:
1791 RETVAL = __AFL_LOOP (count);
1792 OUTPUT:
1793 RETVAL
1794
1795#endif
1796

Diff Legend

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