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.70 by root, Fri Dec 4 02:57:14 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 AS_MAP = 7,
115 // possibly future enhancements: (generic) float, (generic) string
98}; 116};
99 117
100#define F_SHRINK 0x00000001UL 118#define F_SHRINK 0x00000001UL
101#define F_ALLOW_UNKNOWN 0x00000002UL 119#define F_ALLOW_UNKNOWN 0x00000002UL
102#define F_ALLOW_SHARING 0x00000004UL 120#define F_ALLOW_SHARING 0x00000004UL
… …
186 204
187// minimum length of a string to be registered for stringref 205// minimum length of a string to be registered for stringref
188ecb_inline int 206ecb_inline int
189minimum_string_length (UV idx) 207minimum_string_length (UV idx)
190{ 208{
191 return idx > 23 209 return idx <= 23 ? 3
192 ? idx > 0xffU 210 : idx <= 0xffU ? 4
193 ? idx > 0xffffU 211 : idx <= 0xffffU ? 5
194 ? idx > 0xffffffffU 212 : idx <= 0xffffffffU ? 7
195 ? 11 213 : 11;
196 : 7
197 : 5
198 : 4
199 : 3;
200} 214}
201 215
202///////////////////////////////////////////////////////////////////////////// 216/////////////////////////////////////////////////////////////////////////////
203// encoder 217// encoder
204 218
… …
217} enc_t; 231} enc_t;
218 232
219ecb_inline void 233ecb_inline void
220need (enc_t *enc, STRLEN len) 234need (enc_t *enc, STRLEN len)
221{ 235{
222 if (ecb_expect_false (enc->cur + len >= enc->end)) 236 if (ecb_expect_false ((uintptr_t)(enc->end - enc->cur) < len))
223 { 237 {
224 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 238 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
225 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 239 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
226 enc->cur = SvPVX (enc->sv) + cur; 240 enc->cur = SvPVX (enc->sv) + cur;
227 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 241 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
228 } 242 }
229} 243}
230 244
245static void encode_sv (enc_t *enc, SV *sv);
246
231ecb_inline void 247ecb_inline void
232encode_ch (enc_t *enc, char ch) 248encode_ch (enc_t *enc, char ch)
233{ 249{
234 need (enc, 1); 250 need (enc, 1);
235 *enc->cur++ = ch; 251 *enc->cur++ = ch;
236} 252}
237 253
254// used for tags, intregers, element counts and so on
238static void 255static void
239encode_uint (enc_t *enc, int major, UV len) 256encode_uint (enc_t *enc, int major, UV len)
240{ 257{
241 need (enc, 9); 258 need (enc, 9);
242 259
… …
273 *enc->cur++ = len >> 8; 290 *enc->cur++ = len >> 8;
274 *enc->cur++ = len; 291 *enc->cur++ = len;
275 } 292 }
276} 293}
277 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
278ecb_inline void 307ecb_inline void
279encode_tag (enc_t *enc, UV tag) 308encode_tag (enc_t *enc, UV tag)
280{ 309{
281 encode_uint (enc, MAJOR_TAG, tag); 310 encode_uint (enc, MAJOR_TAG, tag);
282} 311}
… …
343 } 372 }
344 373
345 encode_str (enc, upgrade_utf8, utf8, str, len); 374 encode_str (enc, upgrade_utf8, utf8, str, len);
346} 375}
347 376
348static 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}
349 507
350static void 508static void
351encode_av (enc_t *enc, AV *av) 509encode_av (enc_t *enc, AV *av)
352{ 510{
353 int i, len = av_len (av); 511 int i, len = av_len (av);
… …
357 515
358 ++enc->depth; 516 ++enc->depth;
359 517
360 encode_uint (enc, MAJOR_ARRAY, len + 1); 518 encode_uint (enc, MAJOR_ARRAY, len + 1);
361 519
362 if (SvMAGICAL (av)) 520 if (ecb_expect_false (SvMAGICAL (av)))
363 for (i = 0; i <= len; ++i) 521 for (i = 0; i <= len; ++i)
364 { 522 {
365 SV **svp = av_fetch (av, i, 0); 523 SV **svp = av_fetch (av, i, 0);
366 encode_sv (enc, svp ? *svp : &PL_sv_undef); 524 encode_sv (enc, svp ? *svp : &PL_sv_undef);
367 } 525 }
… …
386 ++enc->depth; 544 ++enc->depth;
387 545
388 int pairs = hv_iterinit (hv); 546 int pairs = hv_iterinit (hv);
389 int mg = SvMAGICAL (hv); 547 int mg = SvMAGICAL (hv);
390 548
391 if (mg) 549 if (ecb_expect_false (mg))
392 encode_ch (enc, MAJOR_MAP | MINOR_INDEF); 550 encode_ch (enc, MAJOR_MAP | MINOR_INDEF);
393 else 551 else
394 encode_uint (enc, MAJOR_MAP, pairs); 552 encode_uint (enc, MAJOR_MAP, pairs);
395 553
396 while ((he = hv_iternext (hv))) 554 while ((he = hv_iternext (hv)))
… …
401 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));
402 560
403 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));
404 } 562 }
405 563
406 if (mg) 564 if (ecb_expect_false (mg))
407 encode_ch (enc, MAJOR_MISC | MINOR_INDEF); 565 encode_ch (enc, MAJOR_MISC | MINOR_INDEF);
408 566
409 --enc->depth; 567 --enc->depth;
410} 568}
411 569
… …
431 589
432 HV *stash = SvSTASH (sv); 590 HV *stash = SvSTASH (sv);
433 591
434 if (stash == boolean_stash) 592 if (stash == boolean_stash)
435 { 593 {
436 encode_ch (enc, SvIV (sv) ? MAJOR_MISC | SIMPLE_TRUE : MAJOR_MISC | SIMPLE_FALSE); 594 encode_bool (enc, SvIV (sv));
437 return; 595 return;
438 } 596 }
439 else if (stash == error_stash) 597 else if (stash == error_stash)
440 { 598 {
441 encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF); 599 encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF);
… …
444 else if (stash == tagged_stash) 602 else if (stash == tagged_stash)
445 { 603 {
446 if (svt != SVt_PVAV) 604 if (svt != SVt_PVAV)
447 croak ("encountered CBOR::XS::Tagged object that isn't an array"); 605 croak ("encountered CBOR::XS::Tagged object that isn't an array");
448 606
607 switch (av_len ((AV *)sv))
608 {
609 case 2-1:
610 // actually a tagged value
449 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)));
450 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 }
451 623
452 return; 624 return;
453 } 625 }
454 } 626 }
455 627
456 if (ecb_expect_false (SvREFCNT (sv) > 1) 628 if (ecb_expect_false (SvREFCNT (sv) > 1)
457 && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)) 629 && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING))
458 { 630 {
459 if (!enc->shareable) 631 if (ecb_expect_false (!enc->shareable))
460 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ()); 632 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ());
461 633
462 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1); 634 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1);
463 635
464 if (SvOK (*svp)) 636 if (SvOK (*svp))
… …
510 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0) 682 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
511 { 683 {
512 dSP; 684 dSP;
513 685
514 ENTER; SAVETMPS; 686 ENTER; SAVETMPS;
515 SAVESTACK_POS ();
516 PUSHMARK (SP); 687 PUSHMARK (SP);
517 EXTEND (SP, 2); 688 EXTEND (SP, 2);
518 // 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
519 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 690 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
520 PUSHs (sv_cbor); 691 PUSHs (sv_cbor);
… …
529 700
530 encode_tag (enc, CBOR_TAG_PERL_OBJECT); 701 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
531 encode_uint (enc, MAJOR_ARRAY, count + 1); 702 encode_uint (enc, MAJOR_ARRAY, count + 1);
532 encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash)); 703 encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
533 704
534 while (count) 705 {
706 int i;
707
708 for (i = 0; i < count; ++i)
535 encode_sv (enc, SP[1 - count--]); 709 encode_sv (enc, SP[i + 1 - count]);
710
711 SP -= count;
712 }
536 713
537 PUTBACK; 714 PUTBACK;
538 715
539 FREETMPS; LEAVE; 716 FREETMPS; LEAVE;
540 } 717 }
… …
562 739
563 if (ecb_expect_false (nv == (NV)(U32)nv)) 740 if (ecb_expect_false (nv == (NV)(U32)nv))
564 encode_uint (enc, MAJOR_POS_INT, (U32)nv); 741 encode_uint (enc, MAJOR_POS_INT, (U32)nv);
565 //TODO: maybe I32? 742 //TODO: maybe I32?
566 else if (ecb_expect_false (nv == (float)nv)) 743 else if (ecb_expect_false (nv == (float)nv))
567 { 744 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 745 else
579 { 746 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} 747}
591 748
592static void 749static void
593encode_sv (enc_t *enc, SV *sv) 750encode_sv (enc_t *enc, SV *sv)
594{ 751{
… …
601 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);
602 } 759 }
603 else if (SvNOKp (sv)) 760 else if (SvNOKp (sv))
604 encode_nv (enc, sv); 761 encode_nv (enc, sv);
605 else if (SvIOKp (sv)) 762 else if (SvIOKp (sv))
606 { 763 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)) 764 else if (SvROK (sv))
615 encode_rv (enc, SvRV (sv)); 765 encode_rv (enc, SvRV (sv));
616 else if (!SvOK (sv)) 766 else if (!SvOK (sv))
617 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL); 767 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL);
618 else if (enc->cbor.flags & F_ALLOW_UNKNOWN) 768 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
… …
625static SV * 775static SV *
626encode_cbor (SV *scalar, CBOR *cbor) 776encode_cbor (SV *scalar, CBOR *cbor)
627{ 777{
628 enc_t enc = { 0 }; 778 enc_t enc = { 0 };
629 779
630 enc.cbor = *cbor; 780 enc.cbor = *cbor;
631 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 781 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
632 enc.cur = SvPVX (enc.sv); 782 enc.cur = SvPVX (enc.sv);
633 enc.end = SvEND (enc.sv); 783 enc.end = SvEND (enc.sv);
634 784
635 SvPOK_only (enc.sv); 785 SvPOK_only (enc.sv);
636 786
637 if (cbor->flags & F_PACK_STRINGS) 787 if (cbor->flags & F_PACK_STRINGS)
638 { 788 {
… …
698err_unexpected_end (dec_t *dec) 848err_unexpected_end (dec_t *dec)
699{ 849{
700 err_set (dec, "unexpected end of CBOR data"); 850 err_set (dec, "unexpected end of CBOR data");
701} 851}
702 852
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 853#define ERR_DO(do) SB do; goto fail; SE
710#define ERR(reason) ERR_DO (err_set (dec, reason)) 854#define ERR(reason) ERR_DO (err_set (dec, reason))
711#define ERR_ERRSV ERR_DO (err_errsv (dec)) 855#define ERR_ERRSV ERR_DO (err_errsv (dec))
712 856
713#define WANT(len) if (ecb_expect_false ((UV)(dec->end - dec->cur) < (UV)len)) ERR_DO (err_unexpected_end (dec)) 857#define WANT(len) if (ecb_expect_false ((uintptr_t)(dec->end - dec->cur) < (STRLEN)len)) ERR_DO (err_unexpected_end (dec))
714 858
715#define DEC_INC_DEPTH if (ecb_expect_false (++dec->depth > dec->cbor.max_depth)) ERR (ERR_NESTING_EXCEEDED) 859#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 860#define DEC_DEC_DEPTH --dec->depth
717 861
718static UV 862static UV
… …
786 930
787 for (;;) 931 for (;;)
788 { 932 {
789 WANT (1); 933 WANT (1);
790 934
791 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF)) 935 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
792 { 936 {
793 ++dec->cur; 937 ++dec->cur;
794 break; 938 break;
795 } 939 }
796 940
… …
810 954
811 DEC_DEC_DEPTH; 955 DEC_DEC_DEPTH;
812 return newRV_noinc ((SV *)av); 956 return newRV_noinc ((SV *)av);
813 957
814fail: 958fail:
815 SvREFCNT_dec (av); 959 SvREFCNT_dec_NN (av);
816 DEC_DEC_DEPTH; 960 DEC_DEC_DEPTH;
817 return &PL_sv_undef; 961 return &PL_sv_undef;
818} 962}
819 963
820static void 964static void
… …
883 1027
884 return; 1028 return;
885 } 1029 }
886 1030
887 hv_store_ent (hv, k, v, 0); 1031 hv_store_ent (hv, k, v, 0);
888 SvREFCNT_dec (k); 1032 SvREFCNT_dec_NN (k);
889 1033
890fail: 1034fail:
891 ; 1035 ;
892} 1036}
893 1037
… …
904 1048
905 for (;;) 1049 for (;;)
906 { 1050 {
907 WANT (1); 1051 WANT (1);
908 1052
909 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF)) 1053 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
910 { 1054 {
911 ++dec->cur; 1055 ++dec->cur;
912 break; 1056 break;
913 } 1057 }
914 1058
… …
927 1071
928 DEC_DEC_DEPTH; 1072 DEC_DEC_DEPTH;
929 return newRV_noinc ((SV *)hv); 1073 return newRV_noinc ((SV *)hv);
930 1074
931fail: 1075fail:
932 SvREFCNT_dec (hv); 1076 SvREFCNT_dec_NN (hv);
933 DEC_DEC_DEPTH; 1077 DEC_DEC_DEPTH;
934 return &PL_sv_undef; 1078 return &PL_sv_undef;
935} 1079}
936 1080
937static SV * 1081static SV *
938decode_str (dec_t *dec, int utf8) 1082decode_str (dec_t *dec, int utf8)
939{ 1083{
940 SV *sv = 0; 1084 SV *sv = 0;
941 1085
942 if ((*dec->cur & MINOR_MASK) == MINOR_INDEF) 1086 if (ecb_expect_false ((*dec->cur & MINOR_MASK) == MINOR_INDEF))
943 { 1087 {
944 // indefinite length strings 1088 // indefinite length strings
945 ++dec->cur; 1089 ++dec->cur;
946 1090
947 U8 major = *dec->cur & MAJOR_MISC; 1091 U8 major = *dec->cur & MAJOR_MISC;
… …
1015 sv = newRV_noinc (decode_sv (dec)); 1159 sv = newRV_noinc (decode_sv (dec));
1016 break; 1160 break;
1017 1161
1018 case CBOR_TAG_STRINGREF_NAMESPACE: 1162 case CBOR_TAG_STRINGREF_NAMESPACE:
1019 { 1163 {
1020 // do nmot use SAVETMPS/FREETMPS, as these will 1164 // do not use SAVETMPS/FREETMPS, as these will
1021 // erase mortalised caches, e.g. "shareable" 1165 // erase mortalised caches, e.g. "shareable"
1022 ENTER; 1166 ENTER;
1023 1167
1024 SAVESPTR (dec->stringref); 1168 SAVESPTR (dec->stringref);
1025 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ()); 1169 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ());
… …
1035 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT)) 1179 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
1036 ERR ("corrupted CBOR data (stringref index not an unsigned integer)"); 1180 ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
1037 1181
1038 UV idx = decode_uint (dec); 1182 UV idx = decode_uint (dec);
1039 1183
1040 if (!dec->stringref || (int)idx > AvFILLp (dec->stringref)) 1184 if (!dec->stringref || idx >= (UV)(1 + AvFILLp (dec->stringref)))
1041 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)");
1042 1186
1043 sv = newSVsv (AvARRAY (dec->stringref)[idx]); 1187 sv = newSVsv (AvARRAY (dec->stringref)[idx]);
1044 } 1188 }
1045 break; 1189 break;
… …
1073 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT)) 1217 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
1074 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)"); 1218 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
1075 1219
1076 UV idx = decode_uint (dec); 1220 UV idx = decode_uint (dec);
1077 1221
1078 if (!dec->shareable || (int)idx > AvFILLp (dec->shareable)) 1222 if (!dec->shareable || idx >= (UV)(1 + AvFILLp (dec->shareable)))
1079 ERR ("corrupted CBOR data (sharedref index out of bounds)"); 1223 ERR ("corrupted CBOR data (sharedref index out of bounds)");
1080 1224
1081 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]); 1225 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
1082 1226
1083 if (sv == &PL_sv_undef) 1227 if (sv == &PL_sv_undef)
… …
1129 { 1273 {
1130 FREETMPS; LEAVE; 1274 FREETMPS; LEAVE;
1131 ERR_ERRSV; 1275 ERR_ERRSV;
1132 } 1276 }
1133 1277
1134 SvREFCNT_dec (sv); 1278 SvREFCNT_dec_NN (sv);
1135 sv = SvREFCNT_inc (POPs); 1279 sv = SvREFCNT_inc (POPs);
1136 1280
1137 PUTBACK; 1281 PUTBACK;
1138 1282
1139 FREETMPS; LEAVE; 1283 FREETMPS; LEAVE;
… …
1147 1291
1148 sv = decode_sv (dec); 1292 sv = decode_sv (dec);
1149 1293
1150 dSP; 1294 dSP;
1151 ENTER; SAVETMPS; 1295 ENTER; SAVETMPS;
1152 SAVESTACK_POS ();
1153 PUSHMARK (SP); 1296 PUSHMARK (SP);
1154 EXTEND (SP, 2); 1297 EXTEND (SP, 2);
1155 PUSHs (tag_sv); 1298 PUSHs (tag_sv);
1156 PUSHs (sv); 1299 PUSHs (sv);
1157 1300
… …
1159 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);
1160 SPAGAIN; 1303 SPAGAIN;
1161 1304
1162 if (SvTRUE (ERRSV)) 1305 if (SvTRUE (ERRSV))
1163 { 1306 {
1164 SvREFCNT_dec (tag_sv); 1307 SvREFCNT_dec_NN (tag_sv);
1165 FREETMPS; LEAVE; 1308 FREETMPS; LEAVE;
1166 ERR_ERRSV; 1309 ERR_ERRSV;
1167 } 1310 }
1168 1311
1169 if (count) 1312 if (count)
1170 { 1313 {
1171 SvREFCNT_dec (tag_sv); 1314 SvREFCNT_dec_NN (tag_sv);
1172 SvREFCNT_dec (sv); 1315 SvREFCNT_dec_NN (sv);
1173 sv = SvREFCNT_inc (POPs); 1316 sv = SvREFCNT_inc_NN (TOPs);
1317 SP -= count;
1174 } 1318 }
1175 else 1319 else
1176 { 1320 {
1177 AV *av = newAV (); 1321 AV *av = newAV ();
1178 av_push (av, tag_sv); 1322 av_push (av, tag_sv);
… …
1321 for (i = av_len (dec.shareable) + 1; i--; ) 1465 for (i = av_len (dec.shareable) + 1; i--; )
1322 if ((svp = av_fetch (dec.shareable, i, 0))) 1466 if ((svp = av_fetch (dec.shareable, i, 0)))
1323 sv_setsv (*svp, &PL_sv_undef); 1467 sv_setsv (*svp, &PL_sv_undef);
1324 } 1468 }
1325 1469
1326 SvREFCNT_dec (sv); 1470 SvREFCNT_dec_NN (sv);
1327 1471
1328 if (dec.err_sv) 1472 if (dec.err_sv)
1329 sv_2mortal (dec.err_sv); 1473 sv_2mortal (dec.err_sv);
1330 1474
1331 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);
… …
1674 cbor_init (&cbor); 1818 cbor_init (&cbor);
1675 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN; 1819 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN;
1676 XPUSHs (cborstr); 1820 XPUSHs (cborstr);
1677} 1821}
1678 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