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.69 by root, Mon Nov 30 20:38:25 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_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
348static void encode_sv (enc_t *enc, SV *sv); 471static void encode_sv (enc_t *enc, SV *sv);
349 472
350static void 473static void
351encode_av (enc_t *enc, AV *av) 474encode_av (enc_t *enc, AV *av)
352{ 475{
… …
357 480
358 ++enc->depth; 481 ++enc->depth;
359 482
360 encode_uint (enc, MAJOR_ARRAY, len + 1); 483 encode_uint (enc, MAJOR_ARRAY, len + 1);
361 484
362 if (SvMAGICAL (av)) 485 if (ecb_expect_false (SvMAGICAL (av)))
363 for (i = 0; i <= len; ++i) 486 for (i = 0; i <= len; ++i)
364 { 487 {
365 SV **svp = av_fetch (av, i, 0); 488 SV **svp = av_fetch (av, i, 0);
366 encode_sv (enc, svp ? *svp : &PL_sv_undef); 489 encode_sv (enc, svp ? *svp : &PL_sv_undef);
367 } 490 }
… …
386 ++enc->depth; 509 ++enc->depth;
387 510
388 int pairs = hv_iterinit (hv); 511 int pairs = hv_iterinit (hv);
389 int mg = SvMAGICAL (hv); 512 int mg = SvMAGICAL (hv);
390 513
391 if (mg) 514 if (ecb_expect_false (mg))
392 encode_ch (enc, MAJOR_MAP | MINOR_INDEF); 515 encode_ch (enc, MAJOR_MAP | MINOR_INDEF);
393 else 516 else
394 encode_uint (enc, MAJOR_MAP, pairs); 517 encode_uint (enc, MAJOR_MAP, pairs);
395 518
396 while ((he = hv_iternext (hv))) 519 while ((he = hv_iternext (hv)))
… …
401 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));
402 525
403 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));
404 } 527 }
405 528
406 if (mg) 529 if (ecb_expect_false (mg))
407 encode_ch (enc, MAJOR_MISC | MINOR_INDEF); 530 encode_ch (enc, MAJOR_MISC | MINOR_INDEF);
408 531
409 --enc->depth; 532 --enc->depth;
410} 533}
411 534
… …
431 554
432 HV *stash = SvSTASH (sv); 555 HV *stash = SvSTASH (sv);
433 556
434 if (stash == boolean_stash) 557 if (stash == boolean_stash)
435 { 558 {
436 encode_ch (enc, SvIV (sv) ? MAJOR_MISC | SIMPLE_TRUE : MAJOR_MISC | SIMPLE_FALSE); 559 encode_bool (enc, SvIV (sv));
437 return; 560 return;
438 } 561 }
439 else if (stash == error_stash) 562 else if (stash == error_stash)
440 { 563 {
441 encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF); 564 encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF);
… …
444 else if (stash == tagged_stash) 567 else if (stash == tagged_stash)
445 { 568 {
446 if (svt != SVt_PVAV) 569 if (svt != SVt_PVAV)
447 croak ("encountered CBOR::XS::Tagged object that isn't an array"); 570 croak ("encountered CBOR::XS::Tagged object that isn't an array");
448 571
572 switch (av_len ((AV *)sv))
573 {
574 case 2-1:
575 // actually a tagged value
449 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)));
450 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 }
451 588
452 return; 589 return;
453 } 590 }
454 } 591 }
455 592
456 if (ecb_expect_false (SvREFCNT (sv) > 1) 593 if (ecb_expect_false (SvREFCNT (sv) > 1)
457 && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)) 594 && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING))
458 { 595 {
459 if (!enc->shareable) 596 if (ecb_expect_false (!enc->shareable))
460 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ()); 597 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ());
461 598
462 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1); 599 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1);
463 600
464 if (SvOK (*svp)) 601 if (SvOK (*svp))
… …
510 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0) 647 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
511 { 648 {
512 dSP; 649 dSP;
513 650
514 ENTER; SAVETMPS; 651 ENTER; SAVETMPS;
515 SAVESTACK_POS ();
516 PUSHMARK (SP); 652 PUSHMARK (SP);
517 EXTEND (SP, 2); 653 EXTEND (SP, 2);
518 // 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
519 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 655 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
520 PUSHs (sv_cbor); 656 PUSHs (sv_cbor);
… …
529 665
530 encode_tag (enc, CBOR_TAG_PERL_OBJECT); 666 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
531 encode_uint (enc, MAJOR_ARRAY, count + 1); 667 encode_uint (enc, MAJOR_ARRAY, count + 1);
532 encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash)); 668 encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
533 669
534 while (count) 670 {
671 int i;
672
673 for (i = 0; i < count; ++i)
535 encode_sv (enc, SP[1 - count--]); 674 encode_sv (enc, SP[i + 1 - count]);
675
676 SP -= count;
677 }
536 678
537 PUTBACK; 679 PUTBACK;
538 680
539 FREETMPS; LEAVE; 681 FREETMPS; LEAVE;
540 } 682 }
… …
562 704
563 if (ecb_expect_false (nv == (NV)(U32)nv)) 705 if (ecb_expect_false (nv == (NV)(U32)nv))
564 encode_uint (enc, MAJOR_POS_INT, (U32)nv); 706 encode_uint (enc, MAJOR_POS_INT, (U32)nv);
565 //TODO: maybe I32? 707 //TODO: maybe I32?
566 else if (ecb_expect_false (nv == (float)nv)) 708 else if (ecb_expect_false (nv == (float)nv))
567 { 709 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 710 else
579 { 711 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} 712}
591 713
592static void 714static void
593encode_sv (enc_t *enc, SV *sv) 715encode_sv (enc_t *enc, SV *sv)
594{ 716{
… …
601 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);
602 } 724 }
603 else if (SvNOKp (sv)) 725 else if (SvNOKp (sv))
604 encode_nv (enc, sv); 726 encode_nv (enc, sv);
605 else if (SvIOKp (sv)) 727 else if (SvIOKp (sv))
606 { 728 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)) 729 else if (SvROK (sv))
615 encode_rv (enc, SvRV (sv)); 730 encode_rv (enc, SvRV (sv));
616 else if (!SvOK (sv)) 731 else if (!SvOK (sv))
617 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL); 732 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL);
618 else if (enc->cbor.flags & F_ALLOW_UNKNOWN) 733 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
… …
625static SV * 740static SV *
626encode_cbor (SV *scalar, CBOR *cbor) 741encode_cbor (SV *scalar, CBOR *cbor)
627{ 742{
628 enc_t enc = { 0 }; 743 enc_t enc = { 0 };
629 744
630 enc.cbor = *cbor; 745 enc.cbor = *cbor;
631 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 746 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
632 enc.cur = SvPVX (enc.sv); 747 enc.cur = SvPVX (enc.sv);
633 enc.end = SvEND (enc.sv); 748 enc.end = SvEND (enc.sv);
634 749
635 SvPOK_only (enc.sv); 750 SvPOK_only (enc.sv);
636 751
637 if (cbor->flags & F_PACK_STRINGS) 752 if (cbor->flags & F_PACK_STRINGS)
638 { 753 {
… …
698err_unexpected_end (dec_t *dec) 813err_unexpected_end (dec_t *dec)
699{ 814{
700 err_set (dec, "unexpected end of CBOR data"); 815 err_set (dec, "unexpected end of CBOR data");
701} 816}
702 817
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 818#define ERR_DO(do) SB do; goto fail; SE
710#define ERR(reason) ERR_DO (err_set (dec, reason)) 819#define ERR(reason) ERR_DO (err_set (dec, reason))
711#define ERR_ERRSV ERR_DO (err_errsv (dec)) 820#define ERR_ERRSV ERR_DO (err_errsv (dec))
712 821
713#define WANT(len) if (ecb_expect_false ((UV)(dec->end - dec->cur) < (UV)len)) ERR_DO (err_unexpected_end (dec)) 822#define WANT(len) if (ecb_expect_false ((uintptr_t)(dec->end - dec->cur) < (STRLEN)len)) ERR_DO (err_unexpected_end (dec))
714 823
715#define DEC_INC_DEPTH if (ecb_expect_false (++dec->depth > dec->cbor.max_depth)) ERR (ERR_NESTING_EXCEEDED) 824#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 825#define DEC_DEC_DEPTH --dec->depth
717 826
718static UV 827static UV
… …
786 895
787 for (;;) 896 for (;;)
788 { 897 {
789 WANT (1); 898 WANT (1);
790 899
791 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF)) 900 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
792 { 901 {
793 ++dec->cur; 902 ++dec->cur;
794 break; 903 break;
795 } 904 }
796 905
… …
810 919
811 DEC_DEC_DEPTH; 920 DEC_DEC_DEPTH;
812 return newRV_noinc ((SV *)av); 921 return newRV_noinc ((SV *)av);
813 922
814fail: 923fail:
815 SvREFCNT_dec (av); 924 SvREFCNT_dec_NN (av);
816 DEC_DEC_DEPTH; 925 DEC_DEC_DEPTH;
817 return &PL_sv_undef; 926 return &PL_sv_undef;
818} 927}
819 928
820static void 929static void
… …
883 992
884 return; 993 return;
885 } 994 }
886 995
887 hv_store_ent (hv, k, v, 0); 996 hv_store_ent (hv, k, v, 0);
888 SvREFCNT_dec (k); 997 SvREFCNT_dec_NN (k);
889 998
890fail: 999fail:
891 ; 1000 ;
892} 1001}
893 1002
… …
904 1013
905 for (;;) 1014 for (;;)
906 { 1015 {
907 WANT (1); 1016 WANT (1);
908 1017
909 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF)) 1018 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
910 { 1019 {
911 ++dec->cur; 1020 ++dec->cur;
912 break; 1021 break;
913 } 1022 }
914 1023
… …
927 1036
928 DEC_DEC_DEPTH; 1037 DEC_DEC_DEPTH;
929 return newRV_noinc ((SV *)hv); 1038 return newRV_noinc ((SV *)hv);
930 1039
931fail: 1040fail:
932 SvREFCNT_dec (hv); 1041 SvREFCNT_dec_NN (hv);
933 DEC_DEC_DEPTH; 1042 DEC_DEC_DEPTH;
934 return &PL_sv_undef; 1043 return &PL_sv_undef;
935} 1044}
936 1045
937static SV * 1046static SV *
938decode_str (dec_t *dec, int utf8) 1047decode_str (dec_t *dec, int utf8)
939{ 1048{
940 SV *sv = 0; 1049 SV *sv = 0;
941 1050
942 if ((*dec->cur & MINOR_MASK) == MINOR_INDEF) 1051 if (ecb_expect_false ((*dec->cur & MINOR_MASK) == MINOR_INDEF))
943 { 1052 {
944 // indefinite length strings 1053 // indefinite length strings
945 ++dec->cur; 1054 ++dec->cur;
946 1055
947 U8 major = *dec->cur & MAJOR_MISC; 1056 U8 major = *dec->cur & MAJOR_MISC;
… …
1015 sv = newRV_noinc (decode_sv (dec)); 1124 sv = newRV_noinc (decode_sv (dec));
1016 break; 1125 break;
1017 1126
1018 case CBOR_TAG_STRINGREF_NAMESPACE: 1127 case CBOR_TAG_STRINGREF_NAMESPACE:
1019 { 1128 {
1020 // do nmot use SAVETMPS/FREETMPS, as these will 1129 // do not use SAVETMPS/FREETMPS, as these will
1021 // erase mortalised caches, e.g. "shareable" 1130 // erase mortalised caches, e.g. "shareable"
1022 ENTER; 1131 ENTER;
1023 1132
1024 SAVESPTR (dec->stringref); 1133 SAVESPTR (dec->stringref);
1025 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ()); 1134 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ());
… …
1035 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT)) 1144 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
1036 ERR ("corrupted CBOR data (stringref index not an unsigned integer)"); 1145 ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
1037 1146
1038 UV idx = decode_uint (dec); 1147 UV idx = decode_uint (dec);
1039 1148
1040 if (!dec->stringref || (int)idx > AvFILLp (dec->stringref)) 1149 if (!dec->stringref || idx >= (UV)(1 + AvFILLp (dec->stringref)))
1041 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)");
1042 1151
1043 sv = newSVsv (AvARRAY (dec->stringref)[idx]); 1152 sv = newSVsv (AvARRAY (dec->stringref)[idx]);
1044 } 1153 }
1045 break; 1154 break;
… …
1073 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT)) 1182 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
1074 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)"); 1183 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
1075 1184
1076 UV idx = decode_uint (dec); 1185 UV idx = decode_uint (dec);
1077 1186
1078 if (!dec->shareable || (int)idx > AvFILLp (dec->shareable)) 1187 if (!dec->shareable || idx >= (UV)(1 + AvFILLp (dec->shareable)))
1079 ERR ("corrupted CBOR data (sharedref index out of bounds)"); 1188 ERR ("corrupted CBOR data (sharedref index out of bounds)");
1080 1189
1081 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]); 1190 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
1082 1191
1083 if (sv == &PL_sv_undef) 1192 if (sv == &PL_sv_undef)
… …
1129 { 1238 {
1130 FREETMPS; LEAVE; 1239 FREETMPS; LEAVE;
1131 ERR_ERRSV; 1240 ERR_ERRSV;
1132 } 1241 }
1133 1242
1134 SvREFCNT_dec (sv); 1243 SvREFCNT_dec_NN (sv);
1135 sv = SvREFCNT_inc (POPs); 1244 sv = SvREFCNT_inc (POPs);
1136 1245
1137 PUTBACK; 1246 PUTBACK;
1138 1247
1139 FREETMPS; LEAVE; 1248 FREETMPS; LEAVE;
… …
1147 1256
1148 sv = decode_sv (dec); 1257 sv = decode_sv (dec);
1149 1258
1150 dSP; 1259 dSP;
1151 ENTER; SAVETMPS; 1260 ENTER; SAVETMPS;
1152 SAVESTACK_POS ();
1153 PUSHMARK (SP); 1261 PUSHMARK (SP);
1154 EXTEND (SP, 2); 1262 EXTEND (SP, 2);
1155 PUSHs (tag_sv); 1263 PUSHs (tag_sv);
1156 PUSHs (sv); 1264 PUSHs (sv);
1157 1265
… …
1159 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);
1160 SPAGAIN; 1268 SPAGAIN;
1161 1269
1162 if (SvTRUE (ERRSV)) 1270 if (SvTRUE (ERRSV))
1163 { 1271 {
1164 SvREFCNT_dec (tag_sv); 1272 SvREFCNT_dec_NN (tag_sv);
1165 FREETMPS; LEAVE; 1273 FREETMPS; LEAVE;
1166 ERR_ERRSV; 1274 ERR_ERRSV;
1167 } 1275 }
1168 1276
1169 if (count) 1277 if (count)
1170 { 1278 {
1171 SvREFCNT_dec (tag_sv); 1279 SvREFCNT_dec_NN (tag_sv);
1172 SvREFCNT_dec (sv); 1280 SvREFCNT_dec_NN (sv);
1173 sv = SvREFCNT_inc (POPs); 1281 sv = SvREFCNT_inc_NN (TOPs);
1282 SP -= count;
1174 } 1283 }
1175 else 1284 else
1176 { 1285 {
1177 AV *av = newAV (); 1286 AV *av = newAV ();
1178 av_push (av, tag_sv); 1287 av_push (av, tag_sv);
… …
1321 for (i = av_len (dec.shareable) + 1; i--; ) 1430 for (i = av_len (dec.shareable) + 1; i--; )
1322 if ((svp = av_fetch (dec.shareable, i, 0))) 1431 if ((svp = av_fetch (dec.shareable, i, 0)))
1323 sv_setsv (*svp, &PL_sv_undef); 1432 sv_setsv (*svp, &PL_sv_undef);
1324 } 1433 }
1325 1434
1326 SvREFCNT_dec (sv); 1435 SvREFCNT_dec_NN (sv);
1327 1436
1328 if (dec.err_sv) 1437 if (dec.err_sv)
1329 sv_2mortal (dec.err_sv); 1438 sv_2mortal (dec.err_sv);
1330 1439
1331 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);
… …
1674 cbor_init (&cbor); 1783 cbor_init (&cbor);
1675 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN; 1784 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN;
1676 XPUSHs (cborstr); 1785 XPUSHs (cborstr);
1677} 1786}
1678 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