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.62 by root, Sat Nov 26 02:11:52 2016 UTC vs.
Revision 1.69 by root, Mon Nov 30 20:38:25 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
… …
230{ 246{
231 need (enc, 1); 247 need (enc, 1);
232 *enc->cur++ = ch; 248 *enc->cur++ = ch;
233} 249}
234 250
251// used for tags, intregers, element counts and so on
235static void 252static void
236encode_uint (enc_t *enc, int major, UV len) 253encode_uint (enc_t *enc, int major, UV len)
237{ 254{
238 need (enc, 9); 255 need (enc, 9);
239 256
… …
270 *enc->cur++ = len >> 8; 287 *enc->cur++ = len >> 8;
271 *enc->cur++ = len; 288 *enc->cur++ = len;
272 } 289 }
273} 290}
274 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
275ecb_inline void 304ecb_inline void
276encode_tag (enc_t *enc, UV tag) 305encode_tag (enc_t *enc, UV tag)
277{ 306{
278 encode_uint (enc, MAJOR_TAG, tag); 307 encode_uint (enc, MAJOR_TAG, tag);
279} 308}
… …
340 } 369 }
341 370
342 encode_str (enc, upgrade_utf8, utf8, str, len); 371 encode_str (enc, upgrade_utf8, utf8, str, len);
343} 372}
344 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_bool (enc_t *enc, int istrue)
424{
425 encode_ch (enc, istrue ? MAJOR_MISC | SIMPLE_TRUE : MAJOR_MISC | SIMPLE_FALSE);
426}
427
428ecb_inline void
429encode_forced (enc_t *enc, UV type, SV *sv)
430{
431 switch (type)
432 {
433 case AS_CBOR:
434 {
435 STRLEN len;
436 char *str = SvPVbyte (sv, len);
437
438 need (enc, len);
439 memcpy (enc->cur, str, len);
440 enc->cur += len;
441 }
442 break;
443
444 case AS_BYTES:
445 {
446 STRLEN len;
447 char *str = SvPVbyte (sv, len);
448 encode_strref (enc, 0, 0, str, len);
449 }
450 break;
451
452 case AS_TEXT:
453 {
454 STRLEN len;
455 char *str = SvPVutf8 (sv, len);
456 encode_strref (enc, 1, 1, str, len);
457 }
458 break;
459
460 case AS_INT: encode_int (enc, sv); break;
461
462 case AS_FLOAT16: encode_float16 (enc, SvNV (sv)); break;
463 case AS_FLOAT32: encode_float32 (enc, SvNV (sv)); break;
464 case AS_FLOAT64: encode_float64 (enc, SvNV (sv)); break;
465
466 default:
467 croak ("encountered malformed CBOR::XS::Tagged object");
468 }
469}
470
345static void encode_sv (enc_t *enc, SV *sv); 471static void encode_sv (enc_t *enc, SV *sv);
346 472
347static void 473static void
348encode_av (enc_t *enc, AV *av) 474encode_av (enc_t *enc, AV *av)
349{ 475{
… …
354 480
355 ++enc->depth; 481 ++enc->depth;
356 482
357 encode_uint (enc, MAJOR_ARRAY, len + 1); 483 encode_uint (enc, MAJOR_ARRAY, len + 1);
358 484
359 if (SvMAGICAL (av)) 485 if (ecb_expect_false (SvMAGICAL (av)))
360 for (i = 0; i <= len; ++i) 486 for (i = 0; i <= len; ++i)
361 { 487 {
362 SV **svp = av_fetch (av, i, 0); 488 SV **svp = av_fetch (av, i, 0);
363 encode_sv (enc, svp ? *svp : &PL_sv_undef); 489 encode_sv (enc, svp ? *svp : &PL_sv_undef);
364 } 490 }
… …
383 ++enc->depth; 509 ++enc->depth;
384 510
385 int pairs = hv_iterinit (hv); 511 int pairs = hv_iterinit (hv);
386 int mg = SvMAGICAL (hv); 512 int mg = SvMAGICAL (hv);
387 513
388 if (mg) 514 if (ecb_expect_false (mg))
389 encode_ch (enc, MAJOR_MAP | MINOR_INDEF); 515 encode_ch (enc, MAJOR_MAP | MINOR_INDEF);
390 else 516 else
391 encode_uint (enc, MAJOR_MAP, pairs); 517 encode_uint (enc, MAJOR_MAP, pairs);
392 518
393 while ((he = hv_iternext (hv))) 519 while ((he = hv_iternext (hv)))
… …
398 encode_strref (enc, enc->cbor.flags & (F_TEXT_KEYS | F_TEXT_STRINGS), HeKUTF8 (he), HeKEY (he), HeKLEN (he)); 524 encode_strref (enc, enc->cbor.flags & (F_TEXT_KEYS | F_TEXT_STRINGS), HeKUTF8 (he), HeKEY (he), HeKLEN (he));
399 525
400 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he)); 526 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));
401 } 527 }
402 528
403 if (mg) 529 if (ecb_expect_false (mg))
404 encode_ch (enc, MAJOR_MISC | MINOR_INDEF); 530 encode_ch (enc, MAJOR_MISC | MINOR_INDEF);
405 531
406 --enc->depth; 532 --enc->depth;
407} 533}
408 534
… …
428 554
429 HV *stash = SvSTASH (sv); 555 HV *stash = SvSTASH (sv);
430 556
431 if (stash == boolean_stash) 557 if (stash == boolean_stash)
432 { 558 {
433 encode_ch (enc, SvIV (sv) ? MAJOR_MISC | SIMPLE_TRUE : MAJOR_MISC | SIMPLE_FALSE); 559 encode_bool (enc, SvIV (sv));
434 return; 560 return;
435 } 561 }
436 else if (stash == error_stash) 562 else if (stash == error_stash)
437 { 563 {
438 encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF); 564 encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF);
… …
441 else if (stash == tagged_stash) 567 else if (stash == tagged_stash)
442 { 568 {
443 if (svt != SVt_PVAV) 569 if (svt != SVt_PVAV)
444 croak ("encountered CBOR::XS::Tagged object that isn't an array"); 570 croak ("encountered CBOR::XS::Tagged object that isn't an array");
445 571
572 switch (av_len ((AV *)sv))
573 {
574 case 2-1:
575 // actually a tagged value
446 encode_uint (enc, MAJOR_TAG, SvUV (*av_fetch ((AV *)sv, 0, 1))); 576 encode_uint (enc, MAJOR_TAG, SvUV (*av_fetch ((AV *)sv, 0, 1)));
447 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1)); 577 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1));
578 break;
579
580 case 3-1:
581 // a forced type [value, type, undef]
582 encode_forced (enc, SvUV (*av_fetch ((AV *)sv, 1, 1)), *av_fetch ((AV *)sv, 0, 1));
583 break;
584
585 default:
586 croak ("encountered malformed CBOR::XS::Tagged object");
587 }
448 588
449 return; 589 return;
450 } 590 }
451 } 591 }
452 592
453 if (ecb_expect_false (SvREFCNT (sv) > 1) 593 if (ecb_expect_false (SvREFCNT (sv) > 1)
454 && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)) 594 && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING))
455 { 595 {
456 if (!enc->shareable) 596 if (ecb_expect_false (!enc->shareable))
457 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ()); 597 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ());
458 598
459 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1); 599 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1);
460 600
461 if (SvOK (*svp)) 601 if (SvOK (*svp))
… …
507 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0) 647 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
508 { 648 {
509 dSP; 649 dSP;
510 650
511 ENTER; SAVETMPS; 651 ENTER; SAVETMPS;
512 SAVESTACK_POS ();
513 PUSHMARK (SP); 652 PUSHMARK (SP);
514 EXTEND (SP, 2); 653 EXTEND (SP, 2);
515 // we re-bless the reference to get overload and other niceties right 654 // we re-bless the reference to get overload and other niceties right
516 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 655 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
517 PUSHs (sv_cbor); 656 PUSHs (sv_cbor);
… …
526 665
527 encode_tag (enc, CBOR_TAG_PERL_OBJECT); 666 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
528 encode_uint (enc, MAJOR_ARRAY, count + 1); 667 encode_uint (enc, MAJOR_ARRAY, count + 1);
529 encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash)); 668 encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
530 669
531 while (count) 670 {
671 int i;
672
673 for (i = 0; i < count; ++i)
532 encode_sv (enc, SP[1 - count--]); 674 encode_sv (enc, SP[i + 1 - count]);
675
676 SP -= count;
677 }
533 678
534 PUTBACK; 679 PUTBACK;
535 680
536 FREETMPS; LEAVE; 681 FREETMPS; LEAVE;
537 } 682 }
… …
559 704
560 if (ecb_expect_false (nv == (NV)(U32)nv)) 705 if (ecb_expect_false (nv == (NV)(U32)nv))
561 encode_uint (enc, MAJOR_POS_INT, (U32)nv); 706 encode_uint (enc, MAJOR_POS_INT, (U32)nv);
562 //TODO: maybe I32? 707 //TODO: maybe I32?
563 else if (ecb_expect_false (nv == (float)nv)) 708 else if (ecb_expect_false (nv == (float)nv))
564 { 709 encode_float32 (enc, nv);
565 uint32_t fp = ecb_float_to_binary32 (nv);
566
567 *enc->cur++ = MAJOR_MISC | MISC_FLOAT32;
568
569 if (!ecb_big_endian ())
570 fp = ecb_bswap32 (fp);
571
572 memcpy (enc->cur, &fp, 4);
573 enc->cur += 4;
574 }
575 else 710 else
576 { 711 encode_float64 (enc, nv);
577 uint64_t fp = ecb_double_to_binary64 (nv);
578
579 *enc->cur++ = MAJOR_MISC | MISC_FLOAT64;
580
581 if (!ecb_big_endian ())
582 fp = ecb_bswap64 (fp);
583
584 memcpy (enc->cur, &fp, 8);
585 enc->cur += 8;
586 }
587} 712}
588 713
589static void 714static void
590encode_sv (enc_t *enc, SV *sv) 715encode_sv (enc_t *enc, SV *sv)
591{ 716{
… …
598 encode_strref (enc, enc->cbor.flags & F_TEXT_STRINGS, SvUTF8 (sv), str, len); 723 encode_strref (enc, enc->cbor.flags & F_TEXT_STRINGS, SvUTF8 (sv), str, len);
599 } 724 }
600 else if (SvNOKp (sv)) 725 else if (SvNOKp (sv))
601 encode_nv (enc, sv); 726 encode_nv (enc, sv);
602 else if (SvIOKp (sv)) 727 else if (SvIOKp (sv))
603 { 728 encode_int (enc, sv);
604 if (SvIsUV (sv))
605 encode_uint (enc, MAJOR_POS_INT, SvUVX (sv));
606 else if (SvIVX (sv) >= 0)
607 encode_uint (enc, MAJOR_POS_INT, SvIVX (sv));
608 else
609 encode_uint (enc, MAJOR_NEG_INT, -(SvIVX (sv) + 1));
610 }
611 else if (SvROK (sv)) 729 else if (SvROK (sv))
612 encode_rv (enc, SvRV (sv)); 730 encode_rv (enc, SvRV (sv));
613 else if (!SvOK (sv)) 731 else if (!SvOK (sv))
614 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL); 732 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL);
615 else if (enc->cbor.flags & F_ALLOW_UNKNOWN) 733 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
… …
622static SV * 740static SV *
623encode_cbor (SV *scalar, CBOR *cbor) 741encode_cbor (SV *scalar, CBOR *cbor)
624{ 742{
625 enc_t enc = { 0 }; 743 enc_t enc = { 0 };
626 744
627 enc.cbor = *cbor; 745 enc.cbor = *cbor;
628 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 746 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
629 enc.cur = SvPVX (enc.sv); 747 enc.cur = SvPVX (enc.sv);
630 enc.end = SvEND (enc.sv); 748 enc.end = SvEND (enc.sv);
631 749
632 SvPOK_only (enc.sv); 750 SvPOK_only (enc.sv);
633 751
634 if (cbor->flags & F_PACK_STRINGS) 752 if (cbor->flags & F_PACK_STRINGS)
635 { 753 {
… …
693 811
694ecb_cold static void 812ecb_cold static void
695err_unexpected_end (dec_t *dec) 813err_unexpected_end (dec_t *dec)
696{ 814{
697 err_set (dec, "unexpected end of CBOR data"); 815 err_set (dec, "unexpected end of CBOR data");
698}
699
700ecb_cold static void
701err_nesting_exceeded (dec_t *dec)
702{
703 err_set (dec, ERR_NESTING_EXCEEDED);
704} 816}
705 817
706#define ERR_DO(do) SB do; goto fail; SE 818#define ERR_DO(do) SB do; goto fail; SE
707#define ERR(reason) ERR_DO (err_set (dec, reason)) 819#define ERR(reason) ERR_DO (err_set (dec, reason))
708#define ERR_ERRSV ERR_DO (err_errsv (dec)) 820#define ERR_ERRSV ERR_DO (err_errsv (dec))
… …
783 895
784 for (;;) 896 for (;;)
785 { 897 {
786 WANT (1); 898 WANT (1);
787 899
788 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF)) 900 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
789 { 901 {
790 ++dec->cur; 902 ++dec->cur;
791 break; 903 break;
792 } 904 }
793 905
… …
807 919
808 DEC_DEC_DEPTH; 920 DEC_DEC_DEPTH;
809 return newRV_noinc ((SV *)av); 921 return newRV_noinc ((SV *)av);
810 922
811fail: 923fail:
812 SvREFCNT_dec (av); 924 SvREFCNT_dec_NN (av);
813 DEC_DEC_DEPTH; 925 DEC_DEC_DEPTH;
814 return &PL_sv_undef; 926 return &PL_sv_undef;
815} 927}
816 928
817static void 929static void
… …
880 992
881 return; 993 return;
882 } 994 }
883 995
884 hv_store_ent (hv, k, v, 0); 996 hv_store_ent (hv, k, v, 0);
885 SvREFCNT_dec (k); 997 SvREFCNT_dec_NN (k);
886 998
887fail: 999fail:
888 ; 1000 ;
889} 1001}
890 1002
… …
901 1013
902 for (;;) 1014 for (;;)
903 { 1015 {
904 WANT (1); 1016 WANT (1);
905 1017
906 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF)) 1018 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
907 { 1019 {
908 ++dec->cur; 1020 ++dec->cur;
909 break; 1021 break;
910 } 1022 }
911 1023
… …
924 1036
925 DEC_DEC_DEPTH; 1037 DEC_DEC_DEPTH;
926 return newRV_noinc ((SV *)hv); 1038 return newRV_noinc ((SV *)hv);
927 1039
928fail: 1040fail:
929 SvREFCNT_dec (hv); 1041 SvREFCNT_dec_NN (hv);
930 DEC_DEC_DEPTH; 1042 DEC_DEC_DEPTH;
931 return &PL_sv_undef; 1043 return &PL_sv_undef;
932} 1044}
933 1045
934static SV * 1046static SV *
935decode_str (dec_t *dec, int utf8) 1047decode_str (dec_t *dec, int utf8)
936{ 1048{
937 SV *sv = 0; 1049 SV *sv = 0;
938 1050
939 if ((*dec->cur & MINOR_MASK) == MINOR_INDEF) 1051 if (ecb_expect_false ((*dec->cur & MINOR_MASK) == MINOR_INDEF))
940 { 1052 {
941 // indefinite length strings 1053 // indefinite length strings
942 ++dec->cur; 1054 ++dec->cur;
943 1055
944 U8 major = *dec->cur & MAJOR_MISC; 1056 U8 major = *dec->cur & MAJOR_MISC;
… …
1012 sv = newRV_noinc (decode_sv (dec)); 1124 sv = newRV_noinc (decode_sv (dec));
1013 break; 1125 break;
1014 1126
1015 case CBOR_TAG_STRINGREF_NAMESPACE: 1127 case CBOR_TAG_STRINGREF_NAMESPACE:
1016 { 1128 {
1017 // do nmot use SAVETMPS/FREETMPS, as these will 1129 // do not use SAVETMPS/FREETMPS, as these will
1018 // erase mortalised caches, e.g. "shareable" 1130 // erase mortalised caches, e.g. "shareable"
1019 ENTER; 1131 ENTER;
1020 1132
1021 SAVESPTR (dec->stringref); 1133 SAVESPTR (dec->stringref);
1022 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ()); 1134 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ());
… …
1032 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT)) 1144 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
1033 ERR ("corrupted CBOR data (stringref index not an unsigned integer)"); 1145 ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
1034 1146
1035 UV idx = decode_uint (dec); 1147 UV idx = decode_uint (dec);
1036 1148
1037 if (!dec->stringref || (int)idx > AvFILLp (dec->stringref)) 1149 if (!dec->stringref || idx >= (UV)(1 + AvFILLp (dec->stringref)))
1038 ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)"); 1150 ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)");
1039 1151
1040 sv = newSVsv (AvARRAY (dec->stringref)[idx]); 1152 sv = newSVsv (AvARRAY (dec->stringref)[idx]);
1041 } 1153 }
1042 break; 1154 break;
… …
1070 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT)) 1182 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
1071 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)"); 1183 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
1072 1184
1073 UV idx = decode_uint (dec); 1185 UV idx = decode_uint (dec);
1074 1186
1075 if (!dec->shareable || (int)idx > AvFILLp (dec->shareable)) 1187 if (!dec->shareable || idx >= (UV)(1 + AvFILLp (dec->shareable)))
1076 ERR ("corrupted CBOR data (sharedref index out of bounds)"); 1188 ERR ("corrupted CBOR data (sharedref index out of bounds)");
1077 1189
1078 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]); 1190 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
1079 1191
1080 if (sv == &PL_sv_undef) 1192 if (sv == &PL_sv_undef)
… …
1126 { 1238 {
1127 FREETMPS; LEAVE; 1239 FREETMPS; LEAVE;
1128 ERR_ERRSV; 1240 ERR_ERRSV;
1129 } 1241 }
1130 1242
1131 SvREFCNT_dec (sv); 1243 SvREFCNT_dec_NN (sv);
1132 sv = SvREFCNT_inc (POPs); 1244 sv = SvREFCNT_inc (POPs);
1133 1245
1134 PUTBACK; 1246 PUTBACK;
1135 1247
1136 FREETMPS; LEAVE; 1248 FREETMPS; LEAVE;
… …
1144 1256
1145 sv = decode_sv (dec); 1257 sv = decode_sv (dec);
1146 1258
1147 dSP; 1259 dSP;
1148 ENTER; SAVETMPS; 1260 ENTER; SAVETMPS;
1149 SAVESTACK_POS ();
1150 PUSHMARK (SP); 1261 PUSHMARK (SP);
1151 EXTEND (SP, 2); 1262 EXTEND (SP, 2);
1152 PUSHs (tag_sv); 1263 PUSHs (tag_sv);
1153 PUSHs (sv); 1264 PUSHs (sv);
1154 1265
… …
1156 int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL); 1267 int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL);
1157 SPAGAIN; 1268 SPAGAIN;
1158 1269
1159 if (SvTRUE (ERRSV)) 1270 if (SvTRUE (ERRSV))
1160 { 1271 {
1161 SvREFCNT_dec (tag_sv); 1272 SvREFCNT_dec_NN (tag_sv);
1162 FREETMPS; LEAVE; 1273 FREETMPS; LEAVE;
1163 ERR_ERRSV; 1274 ERR_ERRSV;
1164 } 1275 }
1165 1276
1166 if (count) 1277 if (count)
1167 { 1278 {
1168 SvREFCNT_dec (tag_sv); 1279 SvREFCNT_dec_NN (tag_sv);
1169 SvREFCNT_dec (sv); 1280 SvREFCNT_dec_NN (sv);
1170 sv = SvREFCNT_inc (POPs); 1281 sv = SvREFCNT_inc_NN (TOPs);
1282 SP -= count;
1171 } 1283 }
1172 else 1284 else
1173 { 1285 {
1174 AV *av = newAV (); 1286 AV *av = newAV ();
1175 av_push (av, tag_sv); 1287 av_push (av, tag_sv);
… …
1318 for (i = av_len (dec.shareable) + 1; i--; ) 1430 for (i = av_len (dec.shareable) + 1; i--; )
1319 if ((svp = av_fetch (dec.shareable, i, 0))) 1431 if ((svp = av_fetch (dec.shareable, i, 0)))
1320 sv_setsv (*svp, &PL_sv_undef); 1432 sv_setsv (*svp, &PL_sv_undef);
1321 } 1433 }
1322 1434
1323 SvREFCNT_dec (sv); 1435 SvREFCNT_dec_NN (sv);
1324 1436
1325 if (dec.err_sv) 1437 if (dec.err_sv)
1326 sv_2mortal (dec.err_sv); 1438 sv_2mortal (dec.err_sv);
1327 1439
1328 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur); 1440 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur);
… …
1671 cbor_init (&cbor); 1783 cbor_init (&cbor);
1672 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN; 1784 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN;
1673 XPUSHs (cborstr); 1785 XPUSHs (cborstr);
1674} 1786}
1675 1787
1788#ifdef __AFL_COMPILER
1789
1790void
1791afl_init ()
1792 CODE:
1793 __AFL_INIT ();
1794
1795int
1796afl_loop (unsigned int count = 10000)
1797 CODE:
1798 RETVAL = __AFL_LOOP (count);
1799 OUTPUT:
1800 RETVAL
1801
1802#endif
1803

Diff Legend

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