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.44 by root, Tue Feb 18 22:12:12 2014 UTC vs.
Revision 1.62 by root, Sat Nov 26 02:11:52 2016 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
… …
99 100
100#define F_SHRINK 0x00000001UL 101#define F_SHRINK 0x00000001UL
101#define F_ALLOW_UNKNOWN 0x00000002UL 102#define F_ALLOW_UNKNOWN 0x00000002UL
102#define F_ALLOW_SHARING 0x00000004UL 103#define F_ALLOW_SHARING 0x00000004UL
103#define F_ALLOW_CYCLES 0x00000008UL 104#define F_ALLOW_CYCLES 0x00000008UL
105#define F_FORBID_OBJECTS 0x00000010UL
104#define F_PACK_STRINGS 0x00000010UL 106#define F_PACK_STRINGS 0x00000020UL
107#define F_TEXT_KEYS 0x00000040UL
108#define F_TEXT_STRINGS 0x00000080UL
105#define F_VALIDATE_UTF8 0x00000020UL 109#define F_VALIDATE_UTF8 0x00000100UL
106 110
107#define INIT_SIZE 32 // initial scalar size to be allocated 111#define INIT_SIZE 32 // initial scalar size to be allocated
108 112
109#define SB do { 113#define SB do {
110#define SE } while (0) 114#define SE } while (0)
… …
183 187
184// minimum length of a string to be registered for stringref 188// minimum length of a string to be registered for stringref
185ecb_inline int 189ecb_inline int
186minimum_string_length (UV idx) 190minimum_string_length (UV idx)
187{ 191{
188 return idx > 23 192 return idx <= 23 ? 3
189 ? idx > 0xffU 193 : idx <= 0xffU ? 4
190 ? idx > 0xffffU 194 : idx <= 0xffffU ? 5
191 ? idx > 0xffffffffU 195 : idx <= 0xffffffffU ? 7
192 ? 11 196 : 11;
193 : 7
194 : 5
195 : 4
196 : 3;
197} 197}
198 198
199///////////////////////////////////////////////////////////////////////////// 199/////////////////////////////////////////////////////////////////////////////
200// encoder 200// encoder
201 201
… …
214} enc_t; 214} enc_t;
215 215
216ecb_inline void 216ecb_inline void
217need (enc_t *enc, STRLEN len) 217need (enc_t *enc, STRLEN len)
218{ 218{
219 if (ecb_expect_false (enc->cur + len >= enc->end)) 219 if (ecb_expect_false ((uintptr_t)(enc->end - enc->cur) < len))
220 { 220 {
221 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 221 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
222 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 222 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
223 enc->cur = SvPVX (enc->sv) + cur; 223 enc->cur = SvPVX (enc->sv) + cur;
224 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 224 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
… …
276encode_tag (enc_t *enc, UV tag) 276encode_tag (enc_t *enc, UV tag)
277{ 277{
278 encode_uint (enc, MAJOR_TAG, tag); 278 encode_uint (enc, MAJOR_TAG, tag);
279} 279}
280 280
281// exceptional (hopefully) slow path for byte strings that need to be utf8-encoded
282ecb_noinline static void
283encode_str_utf8 (enc_t *enc, int utf8, char *str, STRLEN len)
284{
285 STRLEN ulen = len;
286 U8 *p, *pend = (U8 *)str + len;
287
288 for (p = (U8 *)str; p < pend; ++p)
289 ulen += *p >> 7; // count set high bits
290
291 encode_uint (enc, MAJOR_TEXT, ulen);
292
293 need (enc, ulen);
294 for (p = (U8 *)str; p < pend; ++p)
295 if (*p < 0x80)
296 *enc->cur++ = *p;
297 else
298 {
299 *enc->cur++ = 0xc0 + (*p >> 6);
300 *enc->cur++ = 0x80 + (*p & 63);
301 }
302}
303
281ecb_inline void 304ecb_inline void
282encode_str (enc_t *enc, int utf8, char *str, STRLEN len) 305encode_str (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len)
283{ 306{
307 if (ecb_expect_false (upgrade_utf8))
308 if (!utf8)
309 {
310 encode_str_utf8 (enc, utf8, str, len);
311 return;
312 }
313
284 encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len); 314 encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len);
285 need (enc, len); 315 need (enc, len);
286 memcpy (enc->cur, str, len); 316 memcpy (enc->cur, str, len);
287 enc->cur += len; 317 enc->cur += len;
288} 318}
289 319
290static void 320ecb_inline void
291encode_strref (enc_t *enc, int utf8, char *str, STRLEN len) 321encode_strref (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len)
292{ 322{
293 if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS)) 323 if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS))
294 { 324 {
295 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1); 325 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);
296 326
… …
307 sv_setuv (*svp, enc->stringref_idx); 337 sv_setuv (*svp, enc->stringref_idx);
308 ++enc->stringref_idx; 338 ++enc->stringref_idx;
309 } 339 }
310 } 340 }
311 341
312 encode_str (enc, utf8, str, len); 342 encode_str (enc, upgrade_utf8, utf8, str, len);
313} 343}
314 344
315static void encode_sv (enc_t *enc, SV *sv); 345static void encode_sv (enc_t *enc, SV *sv);
316 346
317static void 347static void
… …
324 354
325 ++enc->depth; 355 ++enc->depth;
326 356
327 encode_uint (enc, MAJOR_ARRAY, len + 1); 357 encode_uint (enc, MAJOR_ARRAY, len + 1);
328 358
359 if (SvMAGICAL (av))
329 for (i = 0; i <= len; ++i) 360 for (i = 0; i <= len; ++i)
330 { 361 {
331 SV **svp = av_fetch (av, i, 0); 362 SV **svp = av_fetch (av, i, 0);
332 encode_sv (enc, svp ? *svp : &PL_sv_undef); 363 encode_sv (enc, svp ? *svp : &PL_sv_undef);
333 } 364 }
365 else
366 for (i = 0; i <= len; ++i)
367 {
368 SV *sv = AvARRAY (av)[i];
369 encode_sv (enc, sv ? sv : &PL_sv_undef);
370 }
334 371
335 --enc->depth; 372 --enc->depth;
336} 373}
337 374
338static void 375static void
… …
356 while ((he = hv_iternext (hv))) 393 while ((he = hv_iternext (hv)))
357 { 394 {
358 if (HeKLEN (he) == HEf_SVKEY) 395 if (HeKLEN (he) == HEf_SVKEY)
359 encode_sv (enc, HeSVKEY (he)); 396 encode_sv (enc, HeSVKEY (he));
360 else 397 else
361 encode_strref (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he)); 398 encode_strref (enc, enc->cbor.flags & (F_TEXT_KEYS | F_TEXT_STRINGS), HeKUTF8 (he), HeKEY (he), HeKLEN (he));
362 399
363 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he)); 400 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));
364 } 401 }
365 402
366 if (mg) 403 if (mg)
… …
438 if (ecb_expect_false (SvOBJECT (sv))) 475 if (ecb_expect_false (SvOBJECT (sv)))
439 { 476 {
440 HV *stash = SvSTASH (sv); 477 HV *stash = SvSTASH (sv);
441 GV *method; 478 GV *method;
442 479
480 if (enc->cbor.flags & F_FORBID_OBJECTS)
481 croak ("encountered object '%s', but forbid_objects is enabled",
482 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
443 if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0))) 483 else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
444 { 484 {
445 dSP; 485 dSP;
446 486
447 ENTER; SAVETMPS; PUSHMARK (SP); 487 ENTER; SAVETMPS;
488 PUSHMARK (SP);
448 // we re-bless the reference to get overload and other niceties right 489 // we re-bless the reference to get overload and other niceties right
449 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 490 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
450 491
451 PUTBACK; 492 PUTBACK;
452 // G_SCALAR ensures that return value is 1 493 // G_SCALAR ensures that return value is 1
… …
465 } 506 }
466 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0) 507 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
467 { 508 {
468 dSP; 509 dSP;
469 510
470 ENTER; SAVETMPS; PUSHMARK (SP); 511 ENTER; SAVETMPS;
512 SAVESTACK_POS ();
513 PUSHMARK (SP);
471 EXTEND (SP, 2); 514 EXTEND (SP, 2);
472 // we re-bless the reference to get overload and other niceties right 515 // we re-bless the reference to get overload and other niceties right
473 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 516 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
474 PUSHs (sv_cbor); 517 PUSHs (sv_cbor);
475 518
… …
481 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv) 524 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
482 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash)); 525 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
483 526
484 encode_tag (enc, CBOR_TAG_PERL_OBJECT); 527 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
485 encode_uint (enc, MAJOR_ARRAY, count + 1); 528 encode_uint (enc, MAJOR_ARRAY, count + 1);
486 encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash)); 529 encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
487 530
488 while (count) 531 while (count)
489 encode_sv (enc, SP[1 - count--]); 532 encode_sv (enc, SP[1 - count--]);
490 533
491 PUTBACK; 534 PUTBACK;
… …
550 593
551 if (SvPOKp (sv)) 594 if (SvPOKp (sv))
552 { 595 {
553 STRLEN len; 596 STRLEN len;
554 char *str = SvPV (sv, len); 597 char *str = SvPV (sv, len);
555 encode_strref (enc, SvUTF8 (sv), str, len); 598 encode_strref (enc, enc->cbor.flags & F_TEXT_STRINGS, SvUTF8 (sv), str, len);
556 } 599 }
557 else if (SvNOKp (sv)) 600 else if (SvNOKp (sv))
558 encode_nv (enc, sv); 601 encode_nv (enc, sv);
559 else if (SvIOKp (sv)) 602 else if (SvIOKp (sv))
560 { 603 {
… …
577} 620}
578 621
579static SV * 622static SV *
580encode_cbor (SV *scalar, CBOR *cbor) 623encode_cbor (SV *scalar, CBOR *cbor)
581{ 624{
582 enc_t enc = { }; 625 enc_t enc = { 0 };
583 626
584 enc.cbor = *cbor; 627 enc.cbor = *cbor;
585 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 628 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
586 enc.cur = SvPVX (enc.sv); 629 enc.cur = SvPVX (enc.sv);
587 enc.end = SvEND (enc.sv); 630 enc.end = SvEND (enc.sv);
… …
619 U32 depth; // recursion depth 662 U32 depth; // recursion depth
620 U32 maxdepth; // recursion depth limit 663 U32 maxdepth; // recursion depth limit
621 AV *shareable; 664 AV *shareable;
622 AV *stringref; 665 AV *stringref;
623 SV *decode_tagged; 666 SV *decode_tagged;
667 SV *err_sv; // optional sv for error, needs to be freed
624} dec_t; 668} dec_t;
625 669
626#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE 670// set dec->err to ERRSV
671ecb_cold static void
672err_errsv (dec_t *dec)
673{
674 if (!dec->err)
675 {
676 dec->err_sv = newSVsv (ERRSV);
627 677
628#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data") 678 // chop off the trailing \n
679 SvCUR_set (dec->err_sv, SvCUR (dec->err_sv) - 1);
680 *SvEND (dec->err_sv) = 0;
629 681
682 dec->err = SvPVutf8_nolen (dec->err_sv);
683 }
684}
685
686// the following functions are used to reduce code size and help the compiler to optimise
687ecb_cold static void
688err_set (dec_t *dec, const char *reason)
689{
690 if (!dec->err)
691 dec->err = reason;
692}
693
694ecb_cold static void
695err_unexpected_end (dec_t *dec)
696{
697 err_set (dec, "unexpected end of CBOR data");
698}
699
700ecb_cold static void
701err_nesting_exceeded (dec_t *dec)
702{
703 err_set (dec, ERR_NESTING_EXCEEDED);
704}
705
706#define ERR_DO(do) SB do; goto fail; SE
707#define ERR(reason) ERR_DO (err_set (dec, reason))
708#define ERR_ERRSV ERR_DO (err_errsv (dec))
709
710#define WANT(len) if (ecb_expect_false ((uintptr_t)(dec->end - dec->cur) < (STRLEN)len)) ERR_DO (err_unexpected_end (dec))
711
630#define DEC_INC_DEPTH if (++dec->depth > dec->cbor.max_depth) ERR (ERR_NESTING_EXCEEDED) 712#define DEC_INC_DEPTH if (ecb_expect_false (++dec->depth > dec->cbor.max_depth)) ERR (ERR_NESTING_EXCEEDED)
631#define DEC_DEC_DEPTH --dec->depth 713#define DEC_DEC_DEPTH --dec->depth
632 714
633static UV 715static UV
634decode_uint (dec_t *dec) 716decode_uint (dec_t *dec)
635{ 717{
… …
712 av_push (av, decode_sv (dec)); 794 av_push (av, decode_sv (dec));
713 } 795 }
714 } 796 }
715 else 797 else
716 { 798 {
717 int i, len = decode_uint (dec); 799 UV i, len = decode_uint (dec);
718 800
719 WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays 801 WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays
720 av_fill (av, len - 1); 802 av_fill (av, len - 1);
721 803
722 for (i = 0; i < len; ++i) 804 for (i = 0; i < len; ++i)
… …
739 // byte or utf-8 strings as keys, but only when !stringref 821 // byte or utf-8 strings as keys, but only when !stringref
740 822
741 if (ecb_expect_true (!dec->stringref)) 823 if (ecb_expect_true (!dec->stringref))
742 if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8)) 824 if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
743 { 825 {
744 I32 len = decode_uint (dec); 826 STRLEN len = decode_uint (dec);
745 char *key = (char *)dec->cur; 827 char *key = (char *)dec->cur;
746 828
829 WANT (len);
747 dec->cur += len; 830 dec->cur += len;
748 831
749 hv_store (hv, key, len, decode_sv (dec), 0); 832 hv_store (hv, key, len, decode_sv (dec), 0);
750 833
751 return; 834 return;
752 } 835 }
753 else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8)) 836 else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8))
754 { 837 {
755 I32 len = decode_uint (dec); 838 STRLEN len = decode_uint (dec);
756 char *key = (char *)dec->cur; 839 char *key = (char *)dec->cur;
757 840
841 WANT (len);
758 dec->cur += len; 842 dec->cur += len;
759 843
760 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8)) 844 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
761 if (!is_utf8_string (key, len)) 845 if (!is_utf8_string (key, len))
762 ERR ("corrupted CBOR data (invalid UTF-8 in map key)"); 846 ERR ("corrupted CBOR data (invalid UTF-8 in map key)");
… …
766 return; 850 return;
767 } 851 }
768 852
769 SV *k = decode_sv (dec); 853 SV *k = decode_sv (dec);
770 SV *v = decode_sv (dec); 854 SV *v = decode_sv (dec);
855
856 // we leak memory if uncaught exceptions are thrown by random magical
857 // methods, and this is hopefully the only place where it can happen,
858 // so if there is a chance of an exception, take the very slow path.
859 // since catching exceptions is "undocumented/internal/forbidden" by
860 // the new p5p powers, we need to call out to a perl function :/
861 if (ecb_expect_false (SvAMAGIC (k)))
862 {
863 dSP;
864
865 ENTER; SAVETMPS;
866 PUSHMARK (SP);
867 EXTEND (SP, 3);
868 PUSHs (sv_2mortal (newRV_inc ((SV *)hv)));
869 PUSHs (sv_2mortal (k));
870 PUSHs (sv_2mortal (v));
871
872 PUTBACK;
873 call_pv ("CBOR::XS::_hv_store", G_VOID | G_DISCARD | G_EVAL);
874 SPAGAIN;
875
876 FREETMPS; LEAVE;
877
878 if (SvTRUE (ERRSV))
879 ERR_ERRSV;
880
881 return;
882 }
771 883
772 hv_store_ent (hv, k, v, 0); 884 hv_store_ent (hv, k, v, 0);
773 SvREFCNT_dec (k); 885 SvREFCNT_dec (k);
774 886
775fail: 887fail:
… …
800 decode_he (dec, hv); 912 decode_he (dec, hv);
801 } 913 }
802 } 914 }
803 else 915 else
804 { 916 {
805 int pairs = decode_uint (dec); 917 UV pairs = decode_uint (dec);
918
919 WANT (pairs); // complexity check - need at least one byte per value, do not allow supersize hashes
806 920
807 while (pairs--) 921 while (pairs--)
808 decode_he (dec, hv); 922 decode_he (dec, hv);
809 } 923 }
810 924
… …
898 sv = newRV_noinc (decode_sv (dec)); 1012 sv = newRV_noinc (decode_sv (dec));
899 break; 1013 break;
900 1014
901 case CBOR_TAG_STRINGREF_NAMESPACE: 1015 case CBOR_TAG_STRINGREF_NAMESPACE:
902 { 1016 {
1017 // do nmot use SAVETMPS/FREETMPS, as these will
1018 // erase mortalised caches, e.g. "shareable"
903 ENTER; SAVETMPS; 1019 ENTER;
904 1020
905 SAVESPTR (dec->stringref); 1021 SAVESPTR (dec->stringref);
906 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ()); 1022 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ());
907 1023
908 sv = decode_sv (dec); 1024 sv = decode_sv (dec);
909 1025
910 FREETMPS; LEAVE; 1026 LEAVE;
911 } 1027 }
912 break; 1028 break;
913 1029
914 case CBOR_TAG_STRINGREF: 1030 case CBOR_TAG_STRINGREF:
915 { 1031 {
… …
966 } 1082 }
967 break; 1083 break;
968 1084
969 case CBOR_TAG_PERL_OBJECT: 1085 case CBOR_TAG_PERL_OBJECT:
970 { 1086 {
1087 if (dec->cbor.flags & F_FORBID_OBJECTS)
1088 goto filter;
1089
971 sv = decode_sv (dec); 1090 sv = decode_sv (dec);
972 1091
973 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV) 1092 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
974 ERR ("corrupted CBOR data (non-array perl object)"); 1093 ERR ("corrupted CBOR data (non-array perl object)");
975 1094
… …
985 if (!method) 1104 if (!method)
986 ERR ("cannot decode perl-object (package does not have a THAW method)"); 1105 ERR ("cannot decode perl-object (package does not have a THAW method)");
987 1106
988 dSP; 1107 dSP;
989 1108
990 ENTER; SAVETMPS; PUSHMARK (SP); 1109 ENTER; SAVETMPS;
1110 PUSHMARK (SP);
991 EXTEND (SP, len + 1); 1111 EXTEND (SP, len + 1);
992 // we re-bless the reference to get overload and other niceties right 1112 // we re-bless the reference to get overload and other niceties right
993 PUSHs (*av_fetch (av, 0, 1)); 1113 PUSHs (*av_fetch (av, 0, 1));
994 PUSHs (sv_cbor); 1114 PUSHs (sv_cbor);
995 1115
… …
1003 SPAGAIN; 1123 SPAGAIN;
1004 1124
1005 if (SvTRUE (ERRSV)) 1125 if (SvTRUE (ERRSV))
1006 { 1126 {
1007 FREETMPS; LEAVE; 1127 FREETMPS; LEAVE;
1008 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); 1128 ERR_ERRSV;
1009 } 1129 }
1010 1130
1011 SvREFCNT_dec (sv); 1131 SvREFCNT_dec (sv);
1012 sv = SvREFCNT_inc (POPs); 1132 sv = SvREFCNT_inc (POPs);
1013 1133
… …
1016 FREETMPS; LEAVE; 1136 FREETMPS; LEAVE;
1017 } 1137 }
1018 break; 1138 break;
1019 1139
1020 default: 1140 default:
1141 filter:
1021 { 1142 {
1143 SV *tag_sv = newSVuv (tag);
1144
1022 sv = decode_sv (dec); 1145 sv = decode_sv (dec);
1023 1146
1024 dSP; 1147 dSP;
1025 ENTER; SAVETMPS; PUSHMARK (SP); 1148 ENTER; SAVETMPS;
1149 SAVESTACK_POS ();
1150 PUSHMARK (SP);
1026 EXTEND (SP, 2); 1151 EXTEND (SP, 2);
1027 PUSHs (newSVuv (tag)); 1152 PUSHs (tag_sv);
1028 PUSHs (sv); 1153 PUSHs (sv);
1029 1154
1030 PUTBACK; 1155 PUTBACK;
1031 int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL); 1156 int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL);
1032 SPAGAIN; 1157 SPAGAIN;
1033 1158
1034 if (SvTRUE (ERRSV)) 1159 if (SvTRUE (ERRSV))
1035 { 1160 {
1161 SvREFCNT_dec (tag_sv);
1036 FREETMPS; LEAVE; 1162 FREETMPS; LEAVE;
1037 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); 1163 ERR_ERRSV;
1038 } 1164 }
1039 1165
1040 if (count) 1166 if (count)
1041 { 1167 {
1168 SvREFCNT_dec (tag_sv);
1042 SvREFCNT_dec (sv); 1169 SvREFCNT_dec (sv);
1043 sv = SvREFCNT_inc (POPs); 1170 sv = SvREFCNT_inc (POPs);
1044 } 1171 }
1045 else 1172 else
1046 { 1173 {
1047 AV *av = newAV (); 1174 AV *av = newAV ();
1048 av_push (av, newSVuv (tag)); 1175 av_push (av, tag_sv);
1049 av_push (av, sv); 1176 av_push (av, sv);
1050 1177
1051 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 1178 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
1052 ? cbor_tagged_stash 1179 ? cbor_tagged_stash
1053 : gv_stashpv ("CBOR::XS::Tagged" , 1); 1180 : gv_stashpv ("CBOR::XS::Tagged" , 1);
… …
1156} 1283}
1157 1284
1158static SV * 1285static SV *
1159decode_cbor (SV *string, CBOR *cbor, char **offset_return) 1286decode_cbor (SV *string, CBOR *cbor, char **offset_return)
1160{ 1287{
1161 dec_t dec = { }; 1288 dec_t dec = { 0 };
1162 SV *sv; 1289 SV *sv;
1163 STRLEN len; 1290 STRLEN len;
1164 char *data = SvPVbyte (string, len); 1291 char *data = SvPVbyte (string, len);
1165 1292
1166 if (len > cbor->max_size && cbor->max_size) 1293 if (len > cbor->max_size && cbor->max_size)
… …
1182 1309
1183 if (dec.err) 1310 if (dec.err)
1184 { 1311 {
1185 if (dec.shareable) 1312 if (dec.shareable)
1186 { 1313 {
1187 // need to break cyclic links, which whould all be in shareable 1314 // need to break cyclic links, which would all be in shareable
1188 int i; 1315 int i;
1189 SV **svp; 1316 SV **svp;
1190 1317
1191 for (i = av_len (dec.shareable) + 1; i--; ) 1318 for (i = av_len (dec.shareable) + 1; i--; )
1192 if ((svp = av_fetch (dec.shareable, i, 0))) 1319 if ((svp = av_fetch (dec.shareable, i, 0)))
1193 sv_setsv (*svp, &PL_sv_undef); 1320 sv_setsv (*svp, &PL_sv_undef);
1194 } 1321 }
1195 1322
1196 SvREFCNT_dec (sv); 1323 SvREFCNT_dec (sv);
1324
1325 if (dec.err_sv)
1326 sv_2mortal (dec.err_sv);
1327
1197 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur); 1328 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur);
1198 } 1329 }
1199 1330
1200 sv = sv_2mortal (sv); 1331 sv = sv_2mortal (sv);
1201 1332
… …
1257 1388
1258 int major = *p >> MAJOR_SHIFT; 1389 int major = *p >> MAJOR_SHIFT;
1259 1390
1260 switch (major) 1391 switch (major)
1261 { 1392 {
1393 case MAJOR_TAG >> MAJOR_SHIFT:
1394 ++count; // tags merely prefix another value
1395 break;
1396
1262 case MAJOR_BYTES >> MAJOR_SHIFT: 1397 case MAJOR_BYTES >> MAJOR_SHIFT:
1263 case MAJOR_TEXT >> MAJOR_SHIFT: 1398 case MAJOR_TEXT >> MAJOR_SHIFT:
1264 case MAJOR_ARRAY >> MAJOR_SHIFT: 1399 case MAJOR_ARRAY >> MAJOR_SHIFT:
1265 case MAJOR_MAP >> MAJOR_SHIFT: 1400 case MAJOR_MAP >> MAJOR_SHIFT:
1266 { 1401 {
… …
1341 1476
1342 default_filter = newSVpv ("CBOR::XS::default_filter", 0); 1477 default_filter = newSVpv ("CBOR::XS::default_filter", 0);
1343 1478
1344 sv_cbor = newSVpv ("CBOR", 0); 1479 sv_cbor = newSVpv ("CBOR", 0);
1345 SvREADONLY_on (sv_cbor); 1480 SvREADONLY_on (sv_cbor);
1481
1482 assert (("STRLEN must be an unsigned type", 0 <= (STRLEN)-1));
1346} 1483}
1347 1484
1348PROTOTYPES: DISABLE 1485PROTOTYPES: DISABLE
1349 1486
1350void CLONE (...) 1487void CLONE (...)
… …
1370 ALIAS: 1507 ALIAS:
1371 shrink = F_SHRINK 1508 shrink = F_SHRINK
1372 allow_unknown = F_ALLOW_UNKNOWN 1509 allow_unknown = F_ALLOW_UNKNOWN
1373 allow_sharing = F_ALLOW_SHARING 1510 allow_sharing = F_ALLOW_SHARING
1374 allow_cycles = F_ALLOW_CYCLES 1511 allow_cycles = F_ALLOW_CYCLES
1512 forbid_objects = F_FORBID_OBJECTS
1375 pack_strings = F_PACK_STRINGS 1513 pack_strings = F_PACK_STRINGS
1514 text_keys = F_TEXT_KEYS
1515 text_strings = F_TEXT_STRINGS
1376 validate_utf8 = F_VALIDATE_UTF8 1516 validate_utf8 = F_VALIDATE_UTF8
1377 PPCODE: 1517 PPCODE:
1378{ 1518{
1379 if (enable) 1519 if (enable)
1380 self->flags |= ix; 1520 self->flags |= ix;
… …
1388 ALIAS: 1528 ALIAS:
1389 get_shrink = F_SHRINK 1529 get_shrink = F_SHRINK
1390 get_allow_unknown = F_ALLOW_UNKNOWN 1530 get_allow_unknown = F_ALLOW_UNKNOWN
1391 get_allow_sharing = F_ALLOW_SHARING 1531 get_allow_sharing = F_ALLOW_SHARING
1392 get_allow_cycles = F_ALLOW_CYCLES 1532 get_allow_cycles = F_ALLOW_CYCLES
1533 get_forbid_objects = F_FORBID_OBJECTS
1393 get_pack_strings = F_PACK_STRINGS 1534 get_pack_strings = F_PACK_STRINGS
1535 get_text_keys = F_TEXT_KEYS
1536 get_text_strings = F_TEXT_STRINGS
1394 get_validate_utf8 = F_VALIDATE_UTF8 1537 get_validate_utf8 = F_VALIDATE_UTF8
1395 PPCODE: 1538 PPCODE:
1396 XPUSHs (boolSV (self->flags & ix)); 1539 XPUSHs (boolSV (self->flags & ix));
1397 1540
1398void max_depth (CBOR *self, U32 max_depth = 0x80000000UL) 1541void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)

Diff Legend

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