ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cvsroot/CBOR-XS/XS.xs
(Generate patch)

Comparing cvsroot/CBOR-XS/XS.xs (file contents):
Revision 1.44 by root, Tue Feb 18 22:12:12 2014 UTC vs.
Revision 1.60 by root, Sat Nov 26 00:47:02 2016 UTC

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

Diff Legend

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