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.59 by root, Fri Nov 25 23:37:27 2016 UTC vs.
Revision 1.67 by root, Sun Nov 29 21:35:06 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
… …
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
98}; 102};
99 103
104// known forced types, also hardcoded in CBOR.pm
105enum
106{
107 AS_CBOR = 0,
108 AS_BYTES = 1,
109 AS_TEXT = 2,
110 AS_INT = 3,
111 AS_FLOAT16 = 4,
112 AS_FLOAT32 = 5,
113 AS_FLOAT64 = 6,
114 // possibly future enhancements: (generic) float, (generic) string
115};
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
103#define F_ALLOW_CYCLES 0x00000008UL 120#define F_ALLOW_CYCLES 0x00000008UL
121#define F_FORBID_OBJECTS 0x00000010UL
104#define F_PACK_STRINGS 0x00000010UL 122#define F_PACK_STRINGS 0x00000020UL
105#define F_TEXT_KEYS 0x00000020UL 123#define F_TEXT_KEYS 0x00000040UL
106#define F_TEXT_STRINGS 0x00000040UL 124#define F_TEXT_STRINGS 0x00000080UL
107#define F_VALIDATE_UTF8 0x00000080UL 125#define F_VALIDATE_UTF8 0x00000100UL
108 126
109#define INIT_SIZE 32 // initial scalar size to be allocated 127#define INIT_SIZE 32 // initial scalar size to be allocated
110 128
111#define SB do { 129#define SB do {
112#define SE } while (0) 130#define SE } while (0)
… …
185 203
186// minimum length of a string to be registered for stringref 204// minimum length of a string to be registered for stringref
187ecb_inline int 205ecb_inline int
188minimum_string_length (UV idx) 206minimum_string_length (UV idx)
189{ 207{
190 return idx > 23 208 return idx <= 23 ? 3
191 ? idx > 0xffU 209 : idx <= 0xffU ? 4
192 ? idx > 0xffffU 210 : idx <= 0xffffU ? 5
193 ? idx > 0xffffffffU 211 : idx <= 0xffffffffU ? 7
194 ? 11 212 : 11;
195 : 7
196 : 5
197 : 4
198 : 3;
199} 213}
200 214
201///////////////////////////////////////////////////////////////////////////// 215/////////////////////////////////////////////////////////////////////////////
202// encoder 216// encoder
203 217
… …
216} enc_t; 230} enc_t;
217 231
218ecb_inline void 232ecb_inline void
219need (enc_t *enc, STRLEN len) 233need (enc_t *enc, STRLEN len)
220{ 234{
221 if (ecb_expect_false (enc->cur + len >= enc->end)) 235 if (ecb_expect_false ((uintptr_t)(enc->end - enc->cur) < len))
222 { 236 {
223 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 237 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
224 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 238 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
225 enc->cur = SvPVX (enc->sv) + cur; 239 enc->cur = SvPVX (enc->sv) + cur;
226 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 240 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
… …
232{ 246{
233 need (enc, 1); 247 need (enc, 1);
234 *enc->cur++ = ch; 248 *enc->cur++ = ch;
235} 249}
236 250
251// used for tags, intregers, element counts and so on
237static void 252static void
238encode_uint (enc_t *enc, int major, UV len) 253encode_uint (enc_t *enc, int major, UV len)
239{ 254{
240 need (enc, 9); 255 need (enc, 9);
241 256
… …
272 *enc->cur++ = len >> 8; 287 *enc->cur++ = len >> 8;
273 *enc->cur++ = len; 288 *enc->cur++ = len;
274 } 289 }
275} 290}
276 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
277ecb_inline void 304ecb_inline void
278encode_tag (enc_t *enc, UV tag) 305encode_tag (enc_t *enc, UV tag)
279{ 306{
280 encode_uint (enc, MAJOR_TAG, tag); 307 encode_uint (enc, MAJOR_TAG, tag);
281} 308}
… …
342 } 369 }
343 370
344 encode_str (enc, upgrade_utf8, utf8, str, len); 371 encode_str (enc, upgrade_utf8, utf8, str, len);
345} 372}
346 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
347static void encode_sv (enc_t *enc, SV *sv); 464static void encode_sv (enc_t *enc, SV *sv);
348 465
349static void 466static void
350encode_av (enc_t *enc, AV *av) 467encode_av (enc_t *enc, AV *av)
351{ 468{
… …
356 473
357 ++enc->depth; 474 ++enc->depth;
358 475
359 encode_uint (enc, MAJOR_ARRAY, len + 1); 476 encode_uint (enc, MAJOR_ARRAY, len + 1);
360 477
361 if (SvMAGICAL (av)) 478 if (ecb_expect_false (SvMAGICAL (av)))
362 for (i = 0; i <= len; ++i) 479 for (i = 0; i <= len; ++i)
363 { 480 {
364 SV **svp = av_fetch (av, i, 0); 481 SV **svp = av_fetch (av, i, 0);
365 encode_sv (enc, svp ? *svp : &PL_sv_undef); 482 encode_sv (enc, svp ? *svp : &PL_sv_undef);
366 } 483 }
… …
385 ++enc->depth; 502 ++enc->depth;
386 503
387 int pairs = hv_iterinit (hv); 504 int pairs = hv_iterinit (hv);
388 int mg = SvMAGICAL (hv); 505 int mg = SvMAGICAL (hv);
389 506
390 if (mg) 507 if (ecb_expect_false (mg))
391 encode_ch (enc, MAJOR_MAP | MINOR_INDEF); 508 encode_ch (enc, MAJOR_MAP | MINOR_INDEF);
392 else 509 else
393 encode_uint (enc, MAJOR_MAP, pairs); 510 encode_uint (enc, MAJOR_MAP, pairs);
394 511
395 while ((he = hv_iternext (hv))) 512 while ((he = hv_iternext (hv)))
… …
400 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));
401 518
402 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));
403 } 520 }
404 521
405 if (mg) 522 if (ecb_expect_false (mg))
406 encode_ch (enc, MAJOR_MISC | MINOR_INDEF); 523 encode_ch (enc, MAJOR_MISC | MINOR_INDEF);
407 524
408 --enc->depth; 525 --enc->depth;
409} 526}
410 527
… …
443 else if (stash == tagged_stash) 560 else if (stash == tagged_stash)
444 { 561 {
445 if (svt != SVt_PVAV) 562 if (svt != SVt_PVAV)
446 croak ("encountered CBOR::XS::Tagged object that isn't an array"); 563 croak ("encountered CBOR::XS::Tagged object that isn't an array");
447 564
565 switch (av_len ((AV *)sv))
566 {
567 case 2-1:
568 // actually a tagged value
448 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)));
449 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 }
450 581
451 return; 582 return;
452 } 583 }
453 } 584 }
454 585
455 if (ecb_expect_false (SvREFCNT (sv) > 1) 586 if (ecb_expect_false (SvREFCNT (sv) > 1)
456 && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)) 587 && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING))
457 { 588 {
458 if (!enc->shareable) 589 if (ecb_expect_false (!enc->shareable))
459 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ()); 590 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ());
460 591
461 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1); 592 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1);
462 593
463 if (SvOK (*svp)) 594 if (SvOK (*svp))
… …
477 if (ecb_expect_false (SvOBJECT (sv))) 608 if (ecb_expect_false (SvOBJECT (sv)))
478 { 609 {
479 HV *stash = SvSTASH (sv); 610 HV *stash = SvSTASH (sv);
480 GV *method; 611 GV *method;
481 612
613 if (enc->cbor.flags & F_FORBID_OBJECTS)
614 croak ("encountered object '%s', but forbid_objects is enabled",
615 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
482 if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0))) 616 else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
483 { 617 {
484 dSP; 618 dSP;
485 619
486 ENTER; SAVETMPS; 620 ENTER; SAVETMPS;
487 PUSHMARK (SP); 621 PUSHMARK (SP);
… …
506 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0) 640 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
507 { 641 {
508 dSP; 642 dSP;
509 643
510 ENTER; SAVETMPS; 644 ENTER; SAVETMPS;
511 SAVESTACK_POS ();
512 PUSHMARK (SP); 645 PUSHMARK (SP);
513 EXTEND (SP, 2); 646 EXTEND (SP, 2);
514 // 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
515 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 648 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
516 PUSHs (sv_cbor); 649 PUSHs (sv_cbor);
… …
525 658
526 encode_tag (enc, CBOR_TAG_PERL_OBJECT); 659 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
527 encode_uint (enc, MAJOR_ARRAY, count + 1); 660 encode_uint (enc, MAJOR_ARRAY, count + 1);
528 encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash)); 661 encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
529 662
530 while (count) 663 {
664 int i;
665
666 for (i = 0; i < count; ++i)
531 encode_sv (enc, SP[1 - count--]); 667 encode_sv (enc, SP[i + 1 - count]);
668
669 SP -= count;
670 }
532 671
533 PUTBACK; 672 PUTBACK;
534 673
535 FREETMPS; LEAVE; 674 FREETMPS; LEAVE;
536 } 675 }
… …
558 697
559 if (ecb_expect_false (nv == (NV)(U32)nv)) 698 if (ecb_expect_false (nv == (NV)(U32)nv))
560 encode_uint (enc, MAJOR_POS_INT, (U32)nv); 699 encode_uint (enc, MAJOR_POS_INT, (U32)nv);
561 //TODO: maybe I32? 700 //TODO: maybe I32?
562 else if (ecb_expect_false (nv == (float)nv)) 701 else if (ecb_expect_false (nv == (float)nv))
563 { 702 encode_float32 (enc, nv);
564 uint32_t fp = ecb_float_to_binary32 (nv);
565
566 *enc->cur++ = MAJOR_MISC | MISC_FLOAT32;
567
568 if (!ecb_big_endian ())
569 fp = ecb_bswap32 (fp);
570
571 memcpy (enc->cur, &fp, 4);
572 enc->cur += 4;
573 }
574 else 703 else
575 { 704 encode_float64 (enc, nv);
576 uint64_t fp = ecb_double_to_binary64 (nv);
577
578 *enc->cur++ = MAJOR_MISC | MISC_FLOAT64;
579
580 if (!ecb_big_endian ())
581 fp = ecb_bswap64 (fp);
582
583 memcpy (enc->cur, &fp, 8);
584 enc->cur += 8;
585 }
586} 705}
587 706
588static void 707static void
589encode_sv (enc_t *enc, SV *sv) 708encode_sv (enc_t *enc, SV *sv)
590{ 709{
… …
597 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);
598 } 717 }
599 else if (SvNOKp (sv)) 718 else if (SvNOKp (sv))
600 encode_nv (enc, sv); 719 encode_nv (enc, sv);
601 else if (SvIOKp (sv)) 720 else if (SvIOKp (sv))
602 { 721 encode_int (enc, sv);
603 if (SvIsUV (sv))
604 encode_uint (enc, MAJOR_POS_INT, SvUVX (sv));
605 else if (SvIVX (sv) >= 0)
606 encode_uint (enc, MAJOR_POS_INT, SvIVX (sv));
607 else
608 encode_uint (enc, MAJOR_NEG_INT, -(SvIVX (sv) + 1));
609 }
610 else if (SvROK (sv)) 722 else if (SvROK (sv))
611 encode_rv (enc, SvRV (sv)); 723 encode_rv (enc, SvRV (sv));
612 else if (!SvOK (sv)) 724 else if (!SvOK (sv))
613 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL); 725 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL);
614 else if (enc->cbor.flags & F_ALLOW_UNKNOWN) 726 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
… …
621static SV * 733static SV *
622encode_cbor (SV *scalar, CBOR *cbor) 734encode_cbor (SV *scalar, CBOR *cbor)
623{ 735{
624 enc_t enc = { 0 }; 736 enc_t enc = { 0 };
625 737
626 enc.cbor = *cbor; 738 enc.cbor = *cbor;
627 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 739 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
628 enc.cur = SvPVX (enc.sv); 740 enc.cur = SvPVX (enc.sv);
629 enc.end = SvEND (enc.sv); 741 enc.end = SvEND (enc.sv);
630 742
631 SvPOK_only (enc.sv); 743 SvPOK_only (enc.sv);
632 744
633 if (cbor->flags & F_PACK_STRINGS) 745 if (cbor->flags & F_PACK_STRINGS)
634 { 746 {
… …
694err_unexpected_end (dec_t *dec) 806err_unexpected_end (dec_t *dec)
695{ 807{
696 err_set (dec, "unexpected end of CBOR data"); 808 err_set (dec, "unexpected end of CBOR data");
697} 809}
698 810
699ecb_cold static void
700err_nesting_exceeded (dec_t *dec)
701{
702 err_set (dec, ERR_NESTING_EXCEEDED);
703}
704
705#define ERR_DO(do) SB do; goto fail; SE 811#define ERR_DO(do) SB do; goto fail; SE
706#define ERR(reason) ERR_DO (err_set (dec, reason)) 812#define ERR(reason) ERR_DO (err_set (dec, reason))
707#define ERR_ERRSV ERR_DO (err_errsv (dec)) 813#define ERR_ERRSV ERR_DO (err_errsv (dec))
708 814
709#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))
710 816
711#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)
712#define DEC_DEC_DEPTH --dec->depth 818#define DEC_DEC_DEPTH --dec->depth
713 819
714static UV 820static UV
… …
782 888
783 for (;;) 889 for (;;)
784 { 890 {
785 WANT (1); 891 WANT (1);
786 892
787 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF)) 893 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
788 { 894 {
789 ++dec->cur; 895 ++dec->cur;
790 break; 896 break;
791 } 897 }
792 898
… …
806 912
807 DEC_DEC_DEPTH; 913 DEC_DEC_DEPTH;
808 return newRV_noinc ((SV *)av); 914 return newRV_noinc ((SV *)av);
809 915
810fail: 916fail:
811 SvREFCNT_dec (av); 917 SvREFCNT_dec_NN (av);
812 DEC_DEC_DEPTH; 918 DEC_DEC_DEPTH;
813 return &PL_sv_undef; 919 return &PL_sv_undef;
814} 920}
815 921
816static void 922static void
… …
879 985
880 return; 986 return;
881 } 987 }
882 988
883 hv_store_ent (hv, k, v, 0); 989 hv_store_ent (hv, k, v, 0);
884 SvREFCNT_dec (k); 990 SvREFCNT_dec_NN (k);
885 991
886fail: 992fail:
887 ; 993 ;
888} 994}
889 995
… …
900 1006
901 for (;;) 1007 for (;;)
902 { 1008 {
903 WANT (1); 1009 WANT (1);
904 1010
905 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF)) 1011 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
906 { 1012 {
907 ++dec->cur; 1013 ++dec->cur;
908 break; 1014 break;
909 } 1015 }
910 1016
… …
923 1029
924 DEC_DEC_DEPTH; 1030 DEC_DEC_DEPTH;
925 return newRV_noinc ((SV *)hv); 1031 return newRV_noinc ((SV *)hv);
926 1032
927fail: 1033fail:
928 SvREFCNT_dec (hv); 1034 SvREFCNT_dec_NN (hv);
929 DEC_DEC_DEPTH; 1035 DEC_DEC_DEPTH;
930 return &PL_sv_undef; 1036 return &PL_sv_undef;
931} 1037}
932 1038
933static SV * 1039static SV *
934decode_str (dec_t *dec, int utf8) 1040decode_str (dec_t *dec, int utf8)
935{ 1041{
936 SV *sv = 0; 1042 SV *sv = 0;
937 1043
938 if ((*dec->cur & MINOR_MASK) == MINOR_INDEF) 1044 if (ecb_expect_false ((*dec->cur & MINOR_MASK) == MINOR_INDEF))
939 { 1045 {
940 // indefinite length strings 1046 // indefinite length strings
941 ++dec->cur; 1047 ++dec->cur;
942 1048
943 U8 major = *dec->cur & MAJOR_MISC; 1049 U8 major = *dec->cur & MAJOR_MISC;
… …
1011 sv = newRV_noinc (decode_sv (dec)); 1117 sv = newRV_noinc (decode_sv (dec));
1012 break; 1118 break;
1013 1119
1014 case CBOR_TAG_STRINGREF_NAMESPACE: 1120 case CBOR_TAG_STRINGREF_NAMESPACE:
1015 { 1121 {
1016 // do nmot use SAVETMPS/FREETMPS, as these will 1122 // do not use SAVETMPS/FREETMPS, as these will
1017 // erase mortalised caches, e.g. "shareable" 1123 // erase mortalised caches, e.g. "shareable"
1018 ENTER; 1124 ENTER;
1019 1125
1020 SAVESPTR (dec->stringref); 1126 SAVESPTR (dec->stringref);
1021 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ()); 1127 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ());
… …
1031 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT)) 1137 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
1032 ERR ("corrupted CBOR data (stringref index not an unsigned integer)"); 1138 ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
1033 1139
1034 UV idx = decode_uint (dec); 1140 UV idx = decode_uint (dec);
1035 1141
1036 if (!dec->stringref || (int)idx > AvFILLp (dec->stringref)) 1142 if (!dec->stringref || idx >= (UV)(1 + AvFILLp (dec->stringref)))
1037 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)");
1038 1144
1039 sv = newSVsv (AvARRAY (dec->stringref)[idx]); 1145 sv = newSVsv (AvARRAY (dec->stringref)[idx]);
1040 } 1146 }
1041 break; 1147 break;
… …
1069 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT)) 1175 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
1070 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)"); 1176 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
1071 1177
1072 UV idx = decode_uint (dec); 1178 UV idx = decode_uint (dec);
1073 1179
1074 if (!dec->shareable || (int)idx > AvFILLp (dec->shareable)) 1180 if (!dec->shareable || idx >= (UV)(1 + AvFILLp (dec->shareable)))
1075 ERR ("corrupted CBOR data (sharedref index out of bounds)"); 1181 ERR ("corrupted CBOR data (sharedref index out of bounds)");
1076 1182
1077 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]); 1183 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
1078 1184
1079 if (sv == &PL_sv_undef) 1185 if (sv == &PL_sv_undef)
… …
1081 } 1187 }
1082 break; 1188 break;
1083 1189
1084 case CBOR_TAG_PERL_OBJECT: 1190 case CBOR_TAG_PERL_OBJECT:
1085 { 1191 {
1192 if (dec->cbor.flags & F_FORBID_OBJECTS)
1193 goto filter;
1194
1086 sv = decode_sv (dec); 1195 sv = decode_sv (dec);
1087 1196
1088 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV) 1197 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
1089 ERR ("corrupted CBOR data (non-array perl object)"); 1198 ERR ("corrupted CBOR data (non-array perl object)");
1090 1199
… …
1122 { 1231 {
1123 FREETMPS; LEAVE; 1232 FREETMPS; LEAVE;
1124 ERR_ERRSV; 1233 ERR_ERRSV;
1125 } 1234 }
1126 1235
1127 SvREFCNT_dec (sv); 1236 SvREFCNT_dec_NN (sv);
1128 sv = SvREFCNT_inc (POPs); 1237 sv = SvREFCNT_inc (POPs);
1129 1238
1130 PUTBACK; 1239 PUTBACK;
1131 1240
1132 FREETMPS; LEAVE; 1241 FREETMPS; LEAVE;
1133 } 1242 }
1134 break; 1243 break;
1135 1244
1136 default: 1245 default:
1246 filter:
1137 { 1247 {
1138 SV *tag_sv = newSVuv (tag); 1248 SV *tag_sv = newSVuv (tag);
1139 1249
1140 sv = decode_sv (dec); 1250 sv = decode_sv (dec);
1141 1251
1142 dSP; 1252 dSP;
1143 ENTER; SAVETMPS; 1253 ENTER; SAVETMPS;
1144 SAVESTACK_POS ();
1145 PUSHMARK (SP); 1254 PUSHMARK (SP);
1146 EXTEND (SP, 2); 1255 EXTEND (SP, 2);
1147 PUSHs (tag_sv); 1256 PUSHs (tag_sv);
1148 PUSHs (sv); 1257 PUSHs (sv);
1149 1258
… …
1151 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);
1152 SPAGAIN; 1261 SPAGAIN;
1153 1262
1154 if (SvTRUE (ERRSV)) 1263 if (SvTRUE (ERRSV))
1155 { 1264 {
1156 SvREFCNT_dec (tag_sv); 1265 SvREFCNT_dec_NN (tag_sv);
1157 FREETMPS; LEAVE; 1266 FREETMPS; LEAVE;
1158 ERR_ERRSV; 1267 ERR_ERRSV;
1159 } 1268 }
1160 1269
1161 if (count) 1270 if (count)
1162 { 1271 {
1163 SvREFCNT_dec (tag_sv); 1272 SvREFCNT_dec_NN (tag_sv);
1164 SvREFCNT_dec (sv); 1273 SvREFCNT_dec_NN (sv);
1165 sv = SvREFCNT_inc (POPs); 1274 sv = SvREFCNT_inc_NN (TOPs);
1275 SP -= count;
1166 } 1276 }
1167 else 1277 else
1168 { 1278 {
1169 AV *av = newAV (); 1279 AV *av = newAV ();
1170 av_push (av, tag_sv); 1280 av_push (av, tag_sv);
… …
1313 for (i = av_len (dec.shareable) + 1; i--; ) 1423 for (i = av_len (dec.shareable) + 1; i--; )
1314 if ((svp = av_fetch (dec.shareable, i, 0))) 1424 if ((svp = av_fetch (dec.shareable, i, 0)))
1315 sv_setsv (*svp, &PL_sv_undef); 1425 sv_setsv (*svp, &PL_sv_undef);
1316 } 1426 }
1317 1427
1318 SvREFCNT_dec (sv); 1428 SvREFCNT_dec_NN (sv);
1319 1429
1320 if (dec.err_sv) 1430 if (dec.err_sv)
1321 sv_2mortal (dec.err_sv); 1431 sv_2mortal (dec.err_sv);
1322 1432
1323 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);
… …
1502 ALIAS: 1612 ALIAS:
1503 shrink = F_SHRINK 1613 shrink = F_SHRINK
1504 allow_unknown = F_ALLOW_UNKNOWN 1614 allow_unknown = F_ALLOW_UNKNOWN
1505 allow_sharing = F_ALLOW_SHARING 1615 allow_sharing = F_ALLOW_SHARING
1506 allow_cycles = F_ALLOW_CYCLES 1616 allow_cycles = F_ALLOW_CYCLES
1617 forbid_objects = F_FORBID_OBJECTS
1507 pack_strings = F_PACK_STRINGS 1618 pack_strings = F_PACK_STRINGS
1508 text_keys = F_TEXT_KEYS 1619 text_keys = F_TEXT_KEYS
1509 text_strings = F_TEXT_STRINGS 1620 text_strings = F_TEXT_STRINGS
1510 validate_utf8 = F_VALIDATE_UTF8 1621 validate_utf8 = F_VALIDATE_UTF8
1511 PPCODE: 1622 PPCODE:
… …
1522 ALIAS: 1633 ALIAS:
1523 get_shrink = F_SHRINK 1634 get_shrink = F_SHRINK
1524 get_allow_unknown = F_ALLOW_UNKNOWN 1635 get_allow_unknown = F_ALLOW_UNKNOWN
1525 get_allow_sharing = F_ALLOW_SHARING 1636 get_allow_sharing = F_ALLOW_SHARING
1526 get_allow_cycles = F_ALLOW_CYCLES 1637 get_allow_cycles = F_ALLOW_CYCLES
1638 get_forbid_objects = F_FORBID_OBJECTS
1527 get_pack_strings = F_PACK_STRINGS 1639 get_pack_strings = F_PACK_STRINGS
1528 get_text_keys = F_TEXT_KEYS 1640 get_text_keys = F_TEXT_KEYS
1529 get_text_strings = F_TEXT_STRINGS 1641 get_text_strings = F_TEXT_STRINGS
1530 get_validate_utf8 = F_VALIDATE_UTF8 1642 get_validate_utf8 = F_VALIDATE_UTF8
1531 PPCODE: 1643 PPCODE:
… …
1664 cbor_init (&cbor); 1776 cbor_init (&cbor);
1665 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN; 1777 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN;
1666 XPUSHs (cborstr); 1778 XPUSHs (cborstr);
1667} 1779}
1668 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