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.60 by root, Sat Nov 26 00:47:02 2016 UTC vs.
Revision 1.68 by root, Mon Nov 30 18:30:29 2020 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
… …
93 CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8 97 CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8
94 CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8 98 CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8
95 CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8 99 CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
96 100
97 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
98}; 115};
99 116
100#define F_SHRINK 0x00000001UL 117#define F_SHRINK 0x00000001UL
101#define F_ALLOW_UNKNOWN 0x00000002UL 118#define F_ALLOW_UNKNOWN 0x00000002UL
102#define F_ALLOW_SHARING 0x00000004UL 119#define F_ALLOW_SHARING 0x00000004UL
… …
186 203
187// minimum length of a string to be registered for stringref 204// minimum length of a string to be registered for stringref
188ecb_inline int 205ecb_inline int
189minimum_string_length (UV idx) 206minimum_string_length (UV idx)
190{ 207{
191 return idx > 23 208 return idx <= 23 ? 3
192 ? idx > 0xffU 209 : idx <= 0xffU ? 4
193 ? idx > 0xffffU 210 : idx <= 0xffffU ? 5
194 ? idx > 0xffffffffU 211 : idx <= 0xffffffffU ? 7
195 ? 11 212 : 11;
196 : 7
197 : 5
198 : 4
199 : 3;
200} 213}
201 214
202///////////////////////////////////////////////////////////////////////////// 215/////////////////////////////////////////////////////////////////////////////
203// encoder 216// encoder
204 217
… …
217} enc_t; 230} enc_t;
218 231
219ecb_inline void 232ecb_inline void
220need (enc_t *enc, STRLEN len) 233need (enc_t *enc, STRLEN len)
221{ 234{
222 if (ecb_expect_false (enc->cur + len >= enc->end)) 235 if (ecb_expect_false ((uintptr_t)(enc->end - enc->cur) < len))
223 { 236 {
224 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 237 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
225 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 238 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
226 enc->cur = SvPVX (enc->sv) + cur; 239 enc->cur = SvPVX (enc->sv) + cur;
227 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 240 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
… …
233{ 246{
234 need (enc, 1); 247 need (enc, 1);
235 *enc->cur++ = ch; 248 *enc->cur++ = ch;
236} 249}
237 250
251// used for tags, intregers, element counts and so on
238static void 252static void
239encode_uint (enc_t *enc, int major, UV len) 253encode_uint (enc_t *enc, int major, UV len)
240{ 254{
241 need (enc, 9); 255 need (enc, 9);
242 256
… …
273 *enc->cur++ = len >> 8; 287 *enc->cur++ = len >> 8;
274 *enc->cur++ = len; 288 *enc->cur++ = len;
275 } 289 }
276} 290}
277 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
278ecb_inline void 304ecb_inline void
279encode_tag (enc_t *enc, UV tag) 305encode_tag (enc_t *enc, UV tag)
280{ 306{
281 encode_uint (enc, MAJOR_TAG, tag); 307 encode_uint (enc, MAJOR_TAG, tag);
282} 308}
… …
343 } 369 }
344 370
345 encode_str (enc, upgrade_utf8, utf8, str, len); 371 encode_str (enc, upgrade_utf8, utf8, str, len);
346} 372}
347 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
348static void encode_sv (enc_t *enc, SV *sv); 464static void encode_sv (enc_t *enc, SV *sv);
349 465
350static void 466static void
351encode_av (enc_t *enc, AV *av) 467encode_av (enc_t *enc, AV *av)
352{ 468{
… …
357 473
358 ++enc->depth; 474 ++enc->depth;
359 475
360 encode_uint (enc, MAJOR_ARRAY, len + 1); 476 encode_uint (enc, MAJOR_ARRAY, len + 1);
361 477
362 if (SvMAGICAL (av)) 478 if (ecb_expect_false (SvMAGICAL (av)))
363 for (i = 0; i <= len; ++i) 479 for (i = 0; i <= len; ++i)
364 { 480 {
365 SV **svp = av_fetch (av, i, 0); 481 SV **svp = av_fetch (av, i, 0);
366 encode_sv (enc, svp ? *svp : &PL_sv_undef); 482 encode_sv (enc, svp ? *svp : &PL_sv_undef);
367 } 483 }
… …
386 ++enc->depth; 502 ++enc->depth;
387 503
388 int pairs = hv_iterinit (hv); 504 int pairs = hv_iterinit (hv);
389 int mg = SvMAGICAL (hv); 505 int mg = SvMAGICAL (hv);
390 506
391 if (mg) 507 if (ecb_expect_false (mg))
392 encode_ch (enc, MAJOR_MAP | MINOR_INDEF); 508 encode_ch (enc, MAJOR_MAP | MINOR_INDEF);
393 else 509 else
394 encode_uint (enc, MAJOR_MAP, pairs); 510 encode_uint (enc, MAJOR_MAP, pairs);
395 511
396 while ((he = hv_iternext (hv))) 512 while ((he = hv_iternext (hv)))
… …
401 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));
402 518
403 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));
404 } 520 }
405 521
406 if (mg) 522 if (ecb_expect_false (mg))
407 encode_ch (enc, MAJOR_MISC | MINOR_INDEF); 523 encode_ch (enc, MAJOR_MISC | MINOR_INDEF);
408 524
409 --enc->depth; 525 --enc->depth;
410} 526}
411 527
… …
444 else if (stash == tagged_stash) 560 else if (stash == tagged_stash)
445 { 561 {
446 if (svt != SVt_PVAV) 562 if (svt != SVt_PVAV)
447 croak ("encountered CBOR::XS::Tagged object that isn't an array"); 563 croak ("encountered CBOR::XS::Tagged object that isn't an array");
448 564
565 switch (av_len ((AV *)sv))
566 {
567 case 2-1:
568 // actually a tagged value
449 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)));
450 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 }
451 581
452 return; 582 return;
453 } 583 }
454 } 584 }
455 585
456 if (ecb_expect_false (SvREFCNT (sv) > 1) 586 if (ecb_expect_false (SvREFCNT (sv) > 1)
457 && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)) 587 && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING))
458 { 588 {
459 if (!enc->shareable) 589 if (ecb_expect_false (!enc->shareable))
460 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ()); 590 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ());
461 591
462 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1); 592 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1);
463 593
464 if (SvOK (*svp)) 594 if (SvOK (*svp))
… …
510 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0) 640 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
511 { 641 {
512 dSP; 642 dSP;
513 643
514 ENTER; SAVETMPS; 644 ENTER; SAVETMPS;
515 SAVESTACK_POS ();
516 PUSHMARK (SP); 645 PUSHMARK (SP);
517 EXTEND (SP, 2); 646 EXTEND (SP, 2);
518 // 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
519 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 648 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
520 PUSHs (sv_cbor); 649 PUSHs (sv_cbor);
… …
529 658
530 encode_tag (enc, CBOR_TAG_PERL_OBJECT); 659 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
531 encode_uint (enc, MAJOR_ARRAY, count + 1); 660 encode_uint (enc, MAJOR_ARRAY, count + 1);
532 encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash)); 661 encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
533 662
534 while (count) 663 {
664 int i;
665
666 for (i = 0; i < count; ++i)
535 encode_sv (enc, SP[1 - count--]); 667 encode_sv (enc, SP[i + 1 - count]);
668
669 SP -= count;
670 }
536 671
537 PUTBACK; 672 PUTBACK;
538 673
539 FREETMPS; LEAVE; 674 FREETMPS; LEAVE;
540 } 675 }
… …
562 697
563 if (ecb_expect_false (nv == (NV)(U32)nv)) 698 if (ecb_expect_false (nv == (NV)(U32)nv))
564 encode_uint (enc, MAJOR_POS_INT, (U32)nv); 699 encode_uint (enc, MAJOR_POS_INT, (U32)nv);
565 //TODO: maybe I32? 700 //TODO: maybe I32?
566 else if (ecb_expect_false (nv == (float)nv)) 701 else if (ecb_expect_false (nv == (float)nv))
567 { 702 encode_float32 (enc, nv);
568 uint32_t fp = ecb_float_to_binary32 (nv);
569
570 *enc->cur++ = MAJOR_MISC | MISC_FLOAT32;
571
572 if (!ecb_big_endian ())
573 fp = ecb_bswap32 (fp);
574
575 memcpy (enc->cur, &fp, 4);
576 enc->cur += 4;
577 }
578 else 703 else
579 { 704 encode_float64 (enc, nv);
580 uint64_t fp = ecb_double_to_binary64 (nv);
581
582 *enc->cur++ = MAJOR_MISC | MISC_FLOAT64;
583
584 if (!ecb_big_endian ())
585 fp = ecb_bswap64 (fp);
586
587 memcpy (enc->cur, &fp, 8);
588 enc->cur += 8;
589 }
590} 705}
591 706
592static void 707static void
593encode_sv (enc_t *enc, SV *sv) 708encode_sv (enc_t *enc, SV *sv)
594{ 709{
… …
601 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);
602 } 717 }
603 else if (SvNOKp (sv)) 718 else if (SvNOKp (sv))
604 encode_nv (enc, sv); 719 encode_nv (enc, sv);
605 else if (SvIOKp (sv)) 720 else if (SvIOKp (sv))
606 { 721 encode_int (enc, sv);
607 if (SvIsUV (sv))
608 encode_uint (enc, MAJOR_POS_INT, SvUVX (sv));
609 else if (SvIVX (sv) >= 0)
610 encode_uint (enc, MAJOR_POS_INT, SvIVX (sv));
611 else
612 encode_uint (enc, MAJOR_NEG_INT, -(SvIVX (sv) + 1));
613 }
614 else if (SvROK (sv)) 722 else if (SvROK (sv))
615 encode_rv (enc, SvRV (sv)); 723 encode_rv (enc, SvRV (sv));
616 else if (!SvOK (sv)) 724 else if (!SvOK (sv))
617 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL); 725 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL);
618 else if (enc->cbor.flags & F_ALLOW_UNKNOWN) 726 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
… …
625static SV * 733static SV *
626encode_cbor (SV *scalar, CBOR *cbor) 734encode_cbor (SV *scalar, CBOR *cbor)
627{ 735{
628 enc_t enc = { 0 }; 736 enc_t enc = { 0 };
629 737
630 enc.cbor = *cbor; 738 enc.cbor = *cbor;
631 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 739 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
632 enc.cur = SvPVX (enc.sv); 740 enc.cur = SvPVX (enc.sv);
633 enc.end = SvEND (enc.sv); 741 enc.end = SvEND (enc.sv);
634 742
635 SvPOK_only (enc.sv); 743 SvPOK_only (enc.sv);
636 744
637 if (cbor->flags & F_PACK_STRINGS) 745 if (cbor->flags & F_PACK_STRINGS)
638 { 746 {
… …
698err_unexpected_end (dec_t *dec) 806err_unexpected_end (dec_t *dec)
699{ 807{
700 err_set (dec, "unexpected end of CBOR data"); 808 err_set (dec, "unexpected end of CBOR data");
701} 809}
702 810
703ecb_cold static void
704err_nesting_exceeded (dec_t *dec)
705{
706 err_set (dec, ERR_NESTING_EXCEEDED);
707}
708
709#define ERR_DO(do) SB do; goto fail; SE 811#define ERR_DO(do) SB do; goto fail; SE
710#define ERR(reason) ERR_DO (err_set (dec, reason)) 812#define ERR(reason) ERR_DO (err_set (dec, reason))
711#define ERR_ERRSV ERR_DO (err_errsv (dec)) 813#define ERR_ERRSV ERR_DO (err_errsv (dec))
712 814
713#define WANT(len) if (ecb_expect_false ((UV)(dec->end - dec->cur) < (UV)len)) ERR_DO (err_unexpected_end (dec)) 815#define WANT(len) if (ecb_expect_false ((uintptr_t)(dec->end - dec->cur) < (STRLEN)len)) ERR_DO (err_unexpected_end (dec))
714 816
715#define DEC_INC_DEPTH if (ecb_expect_false (++dec->depth > dec->cbor.max_depth)) ERR (ERR_NESTING_EXCEEDED) 817#define DEC_INC_DEPTH if (ecb_expect_false (++dec->depth > dec->cbor.max_depth)) ERR (ERR_NESTING_EXCEEDED)
716#define DEC_DEC_DEPTH --dec->depth 818#define DEC_DEC_DEPTH --dec->depth
717 819
718static UV 820static UV
… …
786 888
787 for (;;) 889 for (;;)
788 { 890 {
789 WANT (1); 891 WANT (1);
790 892
791 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF)) 893 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
792 { 894 {
793 ++dec->cur; 895 ++dec->cur;
794 break; 896 break;
795 } 897 }
796 898
… …
810 912
811 DEC_DEC_DEPTH; 913 DEC_DEC_DEPTH;
812 return newRV_noinc ((SV *)av); 914 return newRV_noinc ((SV *)av);
813 915
814fail: 916fail:
815 SvREFCNT_dec (av); 917 SvREFCNT_dec_NN (av);
816 DEC_DEC_DEPTH; 918 DEC_DEC_DEPTH;
817 return &PL_sv_undef; 919 return &PL_sv_undef;
818} 920}
819 921
820static void 922static void
… …
883 985
884 return; 986 return;
885 } 987 }
886 988
887 hv_store_ent (hv, k, v, 0); 989 hv_store_ent (hv, k, v, 0);
888 SvREFCNT_dec (k); 990 SvREFCNT_dec_NN (k);
889 991
890fail: 992fail:
891 ; 993 ;
892} 994}
893 995
… …
904 1006
905 for (;;) 1007 for (;;)
906 { 1008 {
907 WANT (1); 1009 WANT (1);
908 1010
909 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF)) 1011 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
910 { 1012 {
911 ++dec->cur; 1013 ++dec->cur;
912 break; 1014 break;
913 } 1015 }
914 1016
… …
927 1029
928 DEC_DEC_DEPTH; 1030 DEC_DEC_DEPTH;
929 return newRV_noinc ((SV *)hv); 1031 return newRV_noinc ((SV *)hv);
930 1032
931fail: 1033fail:
932 SvREFCNT_dec (hv); 1034 SvREFCNT_dec_NN (hv);
933 DEC_DEC_DEPTH; 1035 DEC_DEC_DEPTH;
934 return &PL_sv_undef; 1036 return &PL_sv_undef;
935} 1037}
936 1038
937static SV * 1039static SV *
938decode_str (dec_t *dec, int utf8) 1040decode_str (dec_t *dec, int utf8)
939{ 1041{
940 SV *sv = 0; 1042 SV *sv = 0;
941 1043
942 if ((*dec->cur & MINOR_MASK) == MINOR_INDEF) 1044 if (ecb_expect_false ((*dec->cur & MINOR_MASK) == MINOR_INDEF))
943 { 1045 {
944 // indefinite length strings 1046 // indefinite length strings
945 ++dec->cur; 1047 ++dec->cur;
946 1048
947 U8 major = *dec->cur & MAJOR_MISC; 1049 U8 major = *dec->cur & MAJOR_MISC;
… …
1015 sv = newRV_noinc (decode_sv (dec)); 1117 sv = newRV_noinc (decode_sv (dec));
1016 break; 1118 break;
1017 1119
1018 case CBOR_TAG_STRINGREF_NAMESPACE: 1120 case CBOR_TAG_STRINGREF_NAMESPACE:
1019 { 1121 {
1020 // do nmot use SAVETMPS/FREETMPS, as these will 1122 // do not use SAVETMPS/FREETMPS, as these will
1021 // erase mortalised caches, e.g. "shareable" 1123 // erase mortalised caches, e.g. "shareable"
1022 ENTER; 1124 ENTER;
1023 1125
1024 SAVESPTR (dec->stringref); 1126 SAVESPTR (dec->stringref);
1025 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ()); 1127 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ());
… …
1035 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT)) 1137 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
1036 ERR ("corrupted CBOR data (stringref index not an unsigned integer)"); 1138 ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
1037 1139
1038 UV idx = decode_uint (dec); 1140 UV idx = decode_uint (dec);
1039 1141
1040 if (!dec->stringref || (int)idx > AvFILLp (dec->stringref)) 1142 if (!dec->stringref || idx >= (UV)(1 + AvFILLp (dec->stringref)))
1041 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)");
1042 1144
1043 sv = newSVsv (AvARRAY (dec->stringref)[idx]); 1145 sv = newSVsv (AvARRAY (dec->stringref)[idx]);
1044 } 1146 }
1045 break; 1147 break;
… …
1073 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT)) 1175 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
1074 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)"); 1176 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
1075 1177
1076 UV idx = decode_uint (dec); 1178 UV idx = decode_uint (dec);
1077 1179
1078 if (!dec->shareable || (int)idx > AvFILLp (dec->shareable)) 1180 if (!dec->shareable || idx >= (UV)(1 + AvFILLp (dec->shareable)))
1079 ERR ("corrupted CBOR data (sharedref index out of bounds)"); 1181 ERR ("corrupted CBOR data (sharedref index out of bounds)");
1080 1182
1081 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]); 1183 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
1082 1184
1083 if (sv == &PL_sv_undef) 1185 if (sv == &PL_sv_undef)
… …
1129 { 1231 {
1130 FREETMPS; LEAVE; 1232 FREETMPS; LEAVE;
1131 ERR_ERRSV; 1233 ERR_ERRSV;
1132 } 1234 }
1133 1235
1134 SvREFCNT_dec (sv); 1236 SvREFCNT_dec_NN (sv);
1135 sv = SvREFCNT_inc (POPs); 1237 sv = SvREFCNT_inc (POPs);
1136 1238
1137 PUTBACK; 1239 PUTBACK;
1138 1240
1139 FREETMPS; LEAVE; 1241 FREETMPS; LEAVE;
… …
1147 1249
1148 sv = decode_sv (dec); 1250 sv = decode_sv (dec);
1149 1251
1150 dSP; 1252 dSP;
1151 ENTER; SAVETMPS; 1253 ENTER; SAVETMPS;
1152 SAVESTACK_POS ();
1153 PUSHMARK (SP); 1254 PUSHMARK (SP);
1154 EXTEND (SP, 2); 1255 EXTEND (SP, 2);
1155 PUSHs (tag_sv); 1256 PUSHs (tag_sv);
1156 PUSHs (sv); 1257 PUSHs (sv);
1157 1258
… …
1159 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);
1160 SPAGAIN; 1261 SPAGAIN;
1161 1262
1162 if (SvTRUE (ERRSV)) 1263 if (SvTRUE (ERRSV))
1163 { 1264 {
1164 SvREFCNT_dec (tag_sv); 1265 SvREFCNT_dec_NN (tag_sv);
1165 FREETMPS; LEAVE; 1266 FREETMPS; LEAVE;
1166 ERR_ERRSV; 1267 ERR_ERRSV;
1167 } 1268 }
1168 1269
1169 if (count) 1270 if (count)
1170 { 1271 {
1171 SvREFCNT_dec (tag_sv); 1272 SvREFCNT_dec_NN (tag_sv);
1172 SvREFCNT_dec (sv); 1273 SvREFCNT_dec_NN (sv);
1173 sv = SvREFCNT_inc (POPs); 1274 sv = SvREFCNT_inc_NN (TOPs);
1275 SP -= count;
1174 } 1276 }
1175 else 1277 else
1176 { 1278 {
1177 AV *av = newAV (); 1279 AV *av = newAV ();
1178 av_push (av, tag_sv); 1280 av_push (av, tag_sv);
… …
1321 for (i = av_len (dec.shareable) + 1; i--; ) 1423 for (i = av_len (dec.shareable) + 1; i--; )
1322 if ((svp = av_fetch (dec.shareable, i, 0))) 1424 if ((svp = av_fetch (dec.shareable, i, 0)))
1323 sv_setsv (*svp, &PL_sv_undef); 1425 sv_setsv (*svp, &PL_sv_undef);
1324 } 1426 }
1325 1427
1326 SvREFCNT_dec (sv); 1428 SvREFCNT_dec_NN (sv);
1327 1429
1328 if (dec.err_sv) 1430 if (dec.err_sv)
1329 sv_2mortal (dec.err_sv); 1431 sv_2mortal (dec.err_sv);
1330 1432
1331 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);
… …
1674 cbor_init (&cbor); 1776 cbor_init (&cbor);
1675 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN; 1777 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN;
1676 XPUSHs (cborstr); 1778 XPUSHs (cborstr);
1677} 1779}
1678 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