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.70 by root, Fri Dec 4 02:57:14 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 AS_MAP = 7,
115 // possibly future enhancements: (generic) float, (generic) string
99}; 116};
100 117
101#define F_SHRINK 0x00000001UL 118#define F_SHRINK 0x00000001UL
102#define F_ALLOW_UNKNOWN 0x00000002UL 119#define F_ALLOW_UNKNOWN 0x00000002UL
103#define F_ALLOW_SHARING 0x00000004UL 120#define F_ALLOW_SHARING 0x00000004UL
… …
223 enc->cur = SvPVX (enc->sv) + cur; 240 enc->cur = SvPVX (enc->sv) + cur;
224 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 241 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
225 } 242 }
226} 243}
227 244
245static void encode_sv (enc_t *enc, SV *sv);
246
228ecb_inline void 247ecb_inline void
229encode_ch (enc_t *enc, char ch) 248encode_ch (enc_t *enc, char ch)
230{ 249{
231 need (enc, 1); 250 need (enc, 1);
232 *enc->cur++ = ch; 251 *enc->cur++ = ch;
233} 252}
234 253
254// used for tags, intregers, element counts and so on
235static void 255static void
236encode_uint (enc_t *enc, int major, UV len) 256encode_uint (enc_t *enc, int major, UV len)
237{ 257{
238 need (enc, 9); 258 need (enc, 9);
239 259
… …
270 *enc->cur++ = len >> 8; 290 *enc->cur++ = len >> 8;
271 *enc->cur++ = len; 291 *enc->cur++ = len;
272 } 292 }
273} 293}
274 294
295// encodes a perl value into a CBOR integer
296ecb_inline void
297encode_int (enc_t *enc, SV *sv)
298{
299 if (SvIsUV (sv))
300 encode_uint (enc, MAJOR_POS_INT, SvUVX (sv));
301 else if (SvIVX (sv) >= 0)
302 encode_uint (enc, MAJOR_POS_INT, SvIVX (sv));
303 else
304 encode_uint (enc, MAJOR_NEG_INT, -(SvIVX (sv) + 1));
305}
306
275ecb_inline void 307ecb_inline void
276encode_tag (enc_t *enc, UV tag) 308encode_tag (enc_t *enc, UV tag)
277{ 309{
278 encode_uint (enc, MAJOR_TAG, tag); 310 encode_uint (enc, MAJOR_TAG, tag);
279} 311}
… …
340 } 372 }
341 373
342 encode_str (enc, upgrade_utf8, utf8, str, len); 374 encode_str (enc, upgrade_utf8, utf8, str, len);
343} 375}
344 376
345static void encode_sv (enc_t *enc, SV *sv); 377ecb_inline void
378encode_float16 (enc_t *enc, NV nv)
379{
380 need (enc, 1+2);
381
382 *enc->cur++ = MAJOR_MISC | MISC_FLOAT16;
383
384 uint16_t fp = ecb_float_to_binary16 (nv);
385
386 if (!ecb_big_endian ())
387 fp = ecb_bswap16 (fp);
388
389 memcpy (enc->cur, &fp, 2);
390 enc->cur += 2;
391}
392
393ecb_inline void
394encode_float32 (enc_t *enc, NV nv)
395{
396 need (enc, 1+4);
397
398 *enc->cur++ = MAJOR_MISC | MISC_FLOAT32;
399
400 uint32_t fp = ecb_float_to_binary32 (nv);
401
402 if (!ecb_big_endian ())
403 fp = ecb_bswap32 (fp);
404
405 memcpy (enc->cur, &fp, 4);
406 enc->cur += 4;
407}
408
409ecb_inline void
410encode_float64 (enc_t *enc, NV nv)
411{
412 need (enc, 1+8);
413
414 *enc->cur++ = MAJOR_MISC | MISC_FLOAT64;
415
416 uint64_t fp = ecb_double_to_binary64 (nv);
417
418 if (!ecb_big_endian ())
419 fp = ecb_bswap64 (fp);
420
421 memcpy (enc->cur, &fp, 8);
422 enc->cur += 8;
423}
424
425ecb_inline void
426encode_bool (enc_t *enc, int istrue)
427{
428 encode_ch (enc, istrue ? MAJOR_MISC | SIMPLE_TRUE : MAJOR_MISC | SIMPLE_FALSE);
429}
430
431// encodes an arrayref containing key-value pairs as CBOR map
432ecb_inline void
433encode_array_as_map (enc_t *enc, SV *sv)
434{
435 if (enc->depth >= enc->cbor.max_depth)
436 croak (ERR_NESTING_EXCEEDED);
437
438 ++enc->depth;
439
440 // as_map does error checking for us, but we re-check in case
441 // things have changed.
442
443 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
444 croak ("CBOR::XS::as_map requires an array reference (did you change the array after calling as_map?)");
445
446 AV *av = (AV *)SvRV (sv);
447 int i, len = av_len (av);
448
449 if (!(len & 1))
450 croak ("CBOR::XS::as_map requires an even number of elements (did you change the array after calling as_map?)");
451
452 encode_uint (enc, MAJOR_MAP, (len + 1) >> 1);
453
454 for (i = 0; i <= len; ++i)
455 {
456 SV **svp = av_fetch (av, i, 0);
457 encode_sv (enc, svp ? *svp : &PL_sv_undef);
458 }
459
460 --enc->depth;
461}
462
463ecb_inline void
464encode_forced (enc_t *enc, UV type, SV *sv)
465{
466 switch (type)
467 {
468 case AS_CBOR:
469 {
470 STRLEN len;
471 char *str = SvPVbyte (sv, len);
472
473 need (enc, len);
474 memcpy (enc->cur, str, len);
475 enc->cur += len;
476 }
477 break;
478
479 case AS_BYTES:
480 {
481 STRLEN len;
482 char *str = SvPVbyte (sv, len);
483 encode_strref (enc, 0, 0, str, len);
484 }
485 break;
486
487 case AS_TEXT:
488 {
489 STRLEN len;
490 char *str = SvPVutf8 (sv, len);
491 encode_strref (enc, 1, 1, str, len);
492 }
493 break;
494
495 case AS_INT: encode_int (enc, sv); break;
496
497 case AS_FLOAT16: encode_float16 (enc, SvNV (sv)); break;
498 case AS_FLOAT32: encode_float32 (enc, SvNV (sv)); break;
499 case AS_FLOAT64: encode_float64 (enc, SvNV (sv)); break;
500
501 case AS_MAP: encode_array_as_map (enc, sv); break;
502
503 default:
504 croak ("encountered malformed CBOR::XS::Tagged object");
505 }
506}
346 507
347static void 508static void
348encode_av (enc_t *enc, AV *av) 509encode_av (enc_t *enc, AV *av)
349{ 510{
350 int i, len = av_len (av); 511 int i, len = av_len (av);
… …
354 515
355 ++enc->depth; 516 ++enc->depth;
356 517
357 encode_uint (enc, MAJOR_ARRAY, len + 1); 518 encode_uint (enc, MAJOR_ARRAY, len + 1);
358 519
359 if (SvMAGICAL (av)) 520 if (ecb_expect_false (SvMAGICAL (av)))
360 for (i = 0; i <= len; ++i) 521 for (i = 0; i <= len; ++i)
361 { 522 {
362 SV **svp = av_fetch (av, i, 0); 523 SV **svp = av_fetch (av, i, 0);
363 encode_sv (enc, svp ? *svp : &PL_sv_undef); 524 encode_sv (enc, svp ? *svp : &PL_sv_undef);
364 } 525 }
… …
383 ++enc->depth; 544 ++enc->depth;
384 545
385 int pairs = hv_iterinit (hv); 546 int pairs = hv_iterinit (hv);
386 int mg = SvMAGICAL (hv); 547 int mg = SvMAGICAL (hv);
387 548
388 if (mg) 549 if (ecb_expect_false (mg))
389 encode_ch (enc, MAJOR_MAP | MINOR_INDEF); 550 encode_ch (enc, MAJOR_MAP | MINOR_INDEF);
390 else 551 else
391 encode_uint (enc, MAJOR_MAP, pairs); 552 encode_uint (enc, MAJOR_MAP, pairs);
392 553
393 while ((he = hv_iternext (hv))) 554 while ((he = hv_iternext (hv)))
… …
398 encode_strref (enc, enc->cbor.flags & (F_TEXT_KEYS | F_TEXT_STRINGS), HeKUTF8 (he), HeKEY (he), HeKLEN (he)); 559 encode_strref (enc, enc->cbor.flags & (F_TEXT_KEYS | F_TEXT_STRINGS), HeKUTF8 (he), HeKEY (he), HeKLEN (he));
399 560
400 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he)); 561 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));
401 } 562 }
402 563
403 if (mg) 564 if (ecb_expect_false (mg))
404 encode_ch (enc, MAJOR_MISC | MINOR_INDEF); 565 encode_ch (enc, MAJOR_MISC | MINOR_INDEF);
405 566
406 --enc->depth; 567 --enc->depth;
407} 568}
408 569
… …
428 589
429 HV *stash = SvSTASH (sv); 590 HV *stash = SvSTASH (sv);
430 591
431 if (stash == boolean_stash) 592 if (stash == boolean_stash)
432 { 593 {
433 encode_ch (enc, SvIV (sv) ? MAJOR_MISC | SIMPLE_TRUE : MAJOR_MISC | SIMPLE_FALSE); 594 encode_bool (enc, SvIV (sv));
434 return; 595 return;
435 } 596 }
436 else if (stash == error_stash) 597 else if (stash == error_stash)
437 { 598 {
438 encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF); 599 encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF);
… …
441 else if (stash == tagged_stash) 602 else if (stash == tagged_stash)
442 { 603 {
443 if (svt != SVt_PVAV) 604 if (svt != SVt_PVAV)
444 croak ("encountered CBOR::XS::Tagged object that isn't an array"); 605 croak ("encountered CBOR::XS::Tagged object that isn't an array");
445 606
607 switch (av_len ((AV *)sv))
608 {
609 case 2-1:
610 // actually a tagged value
446 encode_uint (enc, MAJOR_TAG, SvUV (*av_fetch ((AV *)sv, 0, 1))); 611 encode_uint (enc, MAJOR_TAG, SvUV (*av_fetch ((AV *)sv, 0, 1)));
447 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1)); 612 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1));
613 break;
614
615 case 3-1:
616 // a forced type [value, type, undef]
617 encode_forced (enc, SvUV (*av_fetch ((AV *)sv, 1, 1)), *av_fetch ((AV *)sv, 0, 1));
618 break;
619
620 default:
621 croak ("encountered malformed CBOR::XS::Tagged object");
622 }
448 623
449 return; 624 return;
450 } 625 }
451 } 626 }
452 627
453 if (ecb_expect_false (SvREFCNT (sv) > 1) 628 if (ecb_expect_false (SvREFCNT (sv) > 1)
454 && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)) 629 && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING))
455 { 630 {
456 if (!enc->shareable) 631 if (ecb_expect_false (!enc->shareable))
457 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ()); 632 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ());
458 633
459 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1); 634 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1);
460 635
461 if (SvOK (*svp)) 636 if (SvOK (*svp))
… …
507 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0) 682 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
508 { 683 {
509 dSP; 684 dSP;
510 685
511 ENTER; SAVETMPS; 686 ENTER; SAVETMPS;
512 SAVESTACK_POS ();
513 PUSHMARK (SP); 687 PUSHMARK (SP);
514 EXTEND (SP, 2); 688 EXTEND (SP, 2);
515 // we re-bless the reference to get overload and other niceties right 689 // we re-bless the reference to get overload and other niceties right
516 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 690 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
517 PUSHs (sv_cbor); 691 PUSHs (sv_cbor);
… …
526 700
527 encode_tag (enc, CBOR_TAG_PERL_OBJECT); 701 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
528 encode_uint (enc, MAJOR_ARRAY, count + 1); 702 encode_uint (enc, MAJOR_ARRAY, count + 1);
529 encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash)); 703 encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
530 704
531 while (count) 705 {
706 int i;
707
708 for (i = 0; i < count; ++i)
532 encode_sv (enc, SP[1 - count--]); 709 encode_sv (enc, SP[i + 1 - count]);
710
711 SP -= count;
712 }
533 713
534 PUTBACK; 714 PUTBACK;
535 715
536 FREETMPS; LEAVE; 716 FREETMPS; LEAVE;
537 } 717 }
… …
559 739
560 if (ecb_expect_false (nv == (NV)(U32)nv)) 740 if (ecb_expect_false (nv == (NV)(U32)nv))
561 encode_uint (enc, MAJOR_POS_INT, (U32)nv); 741 encode_uint (enc, MAJOR_POS_INT, (U32)nv);
562 //TODO: maybe I32? 742 //TODO: maybe I32?
563 else if (ecb_expect_false (nv == (float)nv)) 743 else if (ecb_expect_false (nv == (float)nv))
564 { 744 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 745 else
576 { 746 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} 747}
588 748
589static void 749static void
590encode_sv (enc_t *enc, SV *sv) 750encode_sv (enc_t *enc, SV *sv)
591{ 751{
… …
598 encode_strref (enc, enc->cbor.flags & F_TEXT_STRINGS, SvUTF8 (sv), str, len); 758 encode_strref (enc, enc->cbor.flags & F_TEXT_STRINGS, SvUTF8 (sv), str, len);
599 } 759 }
600 else if (SvNOKp (sv)) 760 else if (SvNOKp (sv))
601 encode_nv (enc, sv); 761 encode_nv (enc, sv);
602 else if (SvIOKp (sv)) 762 else if (SvIOKp (sv))
603 { 763 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)) 764 else if (SvROK (sv))
612 encode_rv (enc, SvRV (sv)); 765 encode_rv (enc, SvRV (sv));
613 else if (!SvOK (sv)) 766 else if (!SvOK (sv))
614 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL); 767 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL);
615 else if (enc->cbor.flags & F_ALLOW_UNKNOWN) 768 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
… …
622static SV * 775static SV *
623encode_cbor (SV *scalar, CBOR *cbor) 776encode_cbor (SV *scalar, CBOR *cbor)
624{ 777{
625 enc_t enc = { 0 }; 778 enc_t enc = { 0 };
626 779
627 enc.cbor = *cbor; 780 enc.cbor = *cbor;
628 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 781 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
629 enc.cur = SvPVX (enc.sv); 782 enc.cur = SvPVX (enc.sv);
630 enc.end = SvEND (enc.sv); 783 enc.end = SvEND (enc.sv);
631 784
632 SvPOK_only (enc.sv); 785 SvPOK_only (enc.sv);
633 786
634 if (cbor->flags & F_PACK_STRINGS) 787 if (cbor->flags & F_PACK_STRINGS)
635 { 788 {
… …
693 846
694ecb_cold static void 847ecb_cold static void
695err_unexpected_end (dec_t *dec) 848err_unexpected_end (dec_t *dec)
696{ 849{
697 err_set (dec, "unexpected end of CBOR data"); 850 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} 851}
705 852
706#define ERR_DO(do) SB do; goto fail; SE 853#define ERR_DO(do) SB do; goto fail; SE
707#define ERR(reason) ERR_DO (err_set (dec, reason)) 854#define ERR(reason) ERR_DO (err_set (dec, reason))
708#define ERR_ERRSV ERR_DO (err_errsv (dec)) 855#define ERR_ERRSV ERR_DO (err_errsv (dec))
… …
783 930
784 for (;;) 931 for (;;)
785 { 932 {
786 WANT (1); 933 WANT (1);
787 934
788 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF)) 935 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
789 { 936 {
790 ++dec->cur; 937 ++dec->cur;
791 break; 938 break;
792 } 939 }
793 940
… …
807 954
808 DEC_DEC_DEPTH; 955 DEC_DEC_DEPTH;
809 return newRV_noinc ((SV *)av); 956 return newRV_noinc ((SV *)av);
810 957
811fail: 958fail:
812 SvREFCNT_dec (av); 959 SvREFCNT_dec_NN (av);
813 DEC_DEC_DEPTH; 960 DEC_DEC_DEPTH;
814 return &PL_sv_undef; 961 return &PL_sv_undef;
815} 962}
816 963
817static void 964static void
… …
880 1027
881 return; 1028 return;
882 } 1029 }
883 1030
884 hv_store_ent (hv, k, v, 0); 1031 hv_store_ent (hv, k, v, 0);
885 SvREFCNT_dec (k); 1032 SvREFCNT_dec_NN (k);
886 1033
887fail: 1034fail:
888 ; 1035 ;
889} 1036}
890 1037
… …
901 1048
902 for (;;) 1049 for (;;)
903 { 1050 {
904 WANT (1); 1051 WANT (1);
905 1052
906 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF)) 1053 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
907 { 1054 {
908 ++dec->cur; 1055 ++dec->cur;
909 break; 1056 break;
910 } 1057 }
911 1058
… …
924 1071
925 DEC_DEC_DEPTH; 1072 DEC_DEC_DEPTH;
926 return newRV_noinc ((SV *)hv); 1073 return newRV_noinc ((SV *)hv);
927 1074
928fail: 1075fail:
929 SvREFCNT_dec (hv); 1076 SvREFCNT_dec_NN (hv);
930 DEC_DEC_DEPTH; 1077 DEC_DEC_DEPTH;
931 return &PL_sv_undef; 1078 return &PL_sv_undef;
932} 1079}
933 1080
934static SV * 1081static SV *
935decode_str (dec_t *dec, int utf8) 1082decode_str (dec_t *dec, int utf8)
936{ 1083{
937 SV *sv = 0; 1084 SV *sv = 0;
938 1085
939 if ((*dec->cur & MINOR_MASK) == MINOR_INDEF) 1086 if (ecb_expect_false ((*dec->cur & MINOR_MASK) == MINOR_INDEF))
940 { 1087 {
941 // indefinite length strings 1088 // indefinite length strings
942 ++dec->cur; 1089 ++dec->cur;
943 1090
944 U8 major = *dec->cur & MAJOR_MISC; 1091 U8 major = *dec->cur & MAJOR_MISC;
… …
1012 sv = newRV_noinc (decode_sv (dec)); 1159 sv = newRV_noinc (decode_sv (dec));
1013 break; 1160 break;
1014 1161
1015 case CBOR_TAG_STRINGREF_NAMESPACE: 1162 case CBOR_TAG_STRINGREF_NAMESPACE:
1016 { 1163 {
1017 // do nmot use SAVETMPS/FREETMPS, as these will 1164 // do not use SAVETMPS/FREETMPS, as these will
1018 // erase mortalised caches, e.g. "shareable" 1165 // erase mortalised caches, e.g. "shareable"
1019 ENTER; 1166 ENTER;
1020 1167
1021 SAVESPTR (dec->stringref); 1168 SAVESPTR (dec->stringref);
1022 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ()); 1169 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ());
… …
1032 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT)) 1179 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
1033 ERR ("corrupted CBOR data (stringref index not an unsigned integer)"); 1180 ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
1034 1181
1035 UV idx = decode_uint (dec); 1182 UV idx = decode_uint (dec);
1036 1183
1037 if (!dec->stringref || (int)idx > AvFILLp (dec->stringref)) 1184 if (!dec->stringref || idx >= (UV)(1 + AvFILLp (dec->stringref)))
1038 ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)"); 1185 ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)");
1039 1186
1040 sv = newSVsv (AvARRAY (dec->stringref)[idx]); 1187 sv = newSVsv (AvARRAY (dec->stringref)[idx]);
1041 } 1188 }
1042 break; 1189 break;
… …
1070 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT)) 1217 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
1071 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)"); 1218 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
1072 1219
1073 UV idx = decode_uint (dec); 1220 UV idx = decode_uint (dec);
1074 1221
1075 if (!dec->shareable || (int)idx > AvFILLp (dec->shareable)) 1222 if (!dec->shareable || idx >= (UV)(1 + AvFILLp (dec->shareable)))
1076 ERR ("corrupted CBOR data (sharedref index out of bounds)"); 1223 ERR ("corrupted CBOR data (sharedref index out of bounds)");
1077 1224
1078 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]); 1225 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
1079 1226
1080 if (sv == &PL_sv_undef) 1227 if (sv == &PL_sv_undef)
… …
1126 { 1273 {
1127 FREETMPS; LEAVE; 1274 FREETMPS; LEAVE;
1128 ERR_ERRSV; 1275 ERR_ERRSV;
1129 } 1276 }
1130 1277
1131 SvREFCNT_dec (sv); 1278 SvREFCNT_dec_NN (sv);
1132 sv = SvREFCNT_inc (POPs); 1279 sv = SvREFCNT_inc (POPs);
1133 1280
1134 PUTBACK; 1281 PUTBACK;
1135 1282
1136 FREETMPS; LEAVE; 1283 FREETMPS; LEAVE;
… …
1144 1291
1145 sv = decode_sv (dec); 1292 sv = decode_sv (dec);
1146 1293
1147 dSP; 1294 dSP;
1148 ENTER; SAVETMPS; 1295 ENTER; SAVETMPS;
1149 SAVESTACK_POS ();
1150 PUSHMARK (SP); 1296 PUSHMARK (SP);
1151 EXTEND (SP, 2); 1297 EXTEND (SP, 2);
1152 PUSHs (tag_sv); 1298 PUSHs (tag_sv);
1153 PUSHs (sv); 1299 PUSHs (sv);
1154 1300
… …
1156 int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL); 1302 int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL);
1157 SPAGAIN; 1303 SPAGAIN;
1158 1304
1159 if (SvTRUE (ERRSV)) 1305 if (SvTRUE (ERRSV))
1160 { 1306 {
1161 SvREFCNT_dec (tag_sv); 1307 SvREFCNT_dec_NN (tag_sv);
1162 FREETMPS; LEAVE; 1308 FREETMPS; LEAVE;
1163 ERR_ERRSV; 1309 ERR_ERRSV;
1164 } 1310 }
1165 1311
1166 if (count) 1312 if (count)
1167 { 1313 {
1168 SvREFCNT_dec (tag_sv); 1314 SvREFCNT_dec_NN (tag_sv);
1169 SvREFCNT_dec (sv); 1315 SvREFCNT_dec_NN (sv);
1170 sv = SvREFCNT_inc (POPs); 1316 sv = SvREFCNT_inc_NN (TOPs);
1317 SP -= count;
1171 } 1318 }
1172 else 1319 else
1173 { 1320 {
1174 AV *av = newAV (); 1321 AV *av = newAV ();
1175 av_push (av, tag_sv); 1322 av_push (av, tag_sv);
… …
1318 for (i = av_len (dec.shareable) + 1; i--; ) 1465 for (i = av_len (dec.shareable) + 1; i--; )
1319 if ((svp = av_fetch (dec.shareable, i, 0))) 1466 if ((svp = av_fetch (dec.shareable, i, 0)))
1320 sv_setsv (*svp, &PL_sv_undef); 1467 sv_setsv (*svp, &PL_sv_undef);
1321 } 1468 }
1322 1469
1323 SvREFCNT_dec (sv); 1470 SvREFCNT_dec_NN (sv);
1324 1471
1325 if (dec.err_sv) 1472 if (dec.err_sv)
1326 sv_2mortal (dec.err_sv); 1473 sv_2mortal (dec.err_sv);
1327 1474
1328 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur); 1475 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur);
… …
1671 cbor_init (&cbor); 1818 cbor_init (&cbor);
1672 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN; 1819 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN;
1673 XPUSHs (cborstr); 1820 XPUSHs (cborstr);
1674} 1821}
1675 1822
1823#ifdef __AFL_COMPILER
1824
1825void
1826afl_init ()
1827 CODE:
1828 __AFL_INIT ();
1829
1830int
1831afl_loop (unsigned int count = 10000)
1832 CODE:
1833 RETVAL = __AFL_LOOP (count);
1834 OUTPUT:
1835 RETVAL
1836
1837#endif
1838

Diff Legend

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