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.48 by root, Sun Sep 20 23:25:53 2015 UTC vs.
Revision 1.61 by root, Sat Nov 26 02:10:19 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
189 ? idx > 0xffU 193 return idx <= 23 ? 3
190 ? idx > 0xffffU 194 : idx <= 0xffU ? 4
195 : idx <= 0xffffU ? 5
191 ? idx > 0xffffffffU 196 : idx <= 0xffffffffU ? 7
192 ? 11 197 : 11;
193 : 7
194 : 5
195 : 4
196 : 3;
197} 198}
198 199
199///////////////////////////////////////////////////////////////////////////// 200/////////////////////////////////////////////////////////////////////////////
200// encoder 201// encoder
201 202
… …
214} enc_t; 215} enc_t;
215 216
216ecb_inline void 217ecb_inline void
217need (enc_t *enc, STRLEN len) 218need (enc_t *enc, STRLEN len)
218{ 219{
219 if (ecb_expect_false (enc->cur + len >= enc->end)) 220 if (ecb_expect_false ((uintptr_t)(enc->end - enc->cur) < len))
220 { 221 {
221 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 222 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
222 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 223 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
223 enc->cur = SvPVX (enc->sv) + cur; 224 enc->cur = SvPVX (enc->sv) + cur;
224 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 225 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
… …
276encode_tag (enc_t *enc, UV tag) 277encode_tag (enc_t *enc, UV tag)
277{ 278{
278 encode_uint (enc, MAJOR_TAG, tag); 279 encode_uint (enc, MAJOR_TAG, tag);
279} 280}
280 281
282// exceptional (hopefully) slow path for byte strings that need to be utf8-encoded
283ecb_noinline static void
284encode_str_utf8 (enc_t *enc, int utf8, char *str, STRLEN len)
285{
286 STRLEN ulen = len;
287 U8 *p, *pend = (U8 *)str + len;
288
289 for (p = (U8 *)str; p < pend; ++p)
290 ulen += *p >> 7; // count set high bits
291
292 encode_uint (enc, MAJOR_TEXT, ulen);
293
294 need (enc, ulen);
295 for (p = (U8 *)str; p < pend; ++p)
296 if (*p < 0x80)
297 *enc->cur++ = *p;
298 else
299 {
300 *enc->cur++ = 0xc0 + (*p >> 6);
301 *enc->cur++ = 0x80 + (*p & 63);
302 }
303}
304
281ecb_inline void 305ecb_inline void
282encode_str (enc_t *enc, int utf8, char *str, STRLEN len) 306encode_str (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len)
283{ 307{
308 if (ecb_expect_false (upgrade_utf8))
309 if (!utf8)
310 {
311 encode_str_utf8 (enc, utf8, str, len);
312 return;
313 }
314
284 encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len); 315 encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len);
285 need (enc, len); 316 need (enc, len);
286 memcpy (enc->cur, str, len); 317 memcpy (enc->cur, str, len);
287 enc->cur += len; 318 enc->cur += len;
288} 319}
289 320
290static void 321ecb_inline void
291encode_strref (enc_t *enc, int utf8, char *str, STRLEN len) 322encode_strref (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len)
292{ 323{
293 if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS)) 324 if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS))
294 { 325 {
295 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1); 326 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);
296 327
… …
307 sv_setuv (*svp, enc->stringref_idx); 338 sv_setuv (*svp, enc->stringref_idx);
308 ++enc->stringref_idx; 339 ++enc->stringref_idx;
309 } 340 }
310 } 341 }
311 342
312 encode_str (enc, utf8, str, len); 343 encode_str (enc, upgrade_utf8, utf8, str, len);
313} 344}
314 345
315static void encode_sv (enc_t *enc, SV *sv); 346static void encode_sv (enc_t *enc, SV *sv);
316 347
317static void 348static void
… …
363 while ((he = hv_iternext (hv))) 394 while ((he = hv_iternext (hv)))
364 { 395 {
365 if (HeKLEN (he) == HEf_SVKEY) 396 if (HeKLEN (he) == HEf_SVKEY)
366 encode_sv (enc, HeSVKEY (he)); 397 encode_sv (enc, HeSVKEY (he));
367 else 398 else
368 encode_strref (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he)); 399 encode_strref (enc, enc->cbor.flags & (F_TEXT_KEYS | F_TEXT_STRINGS), HeKUTF8 (he), HeKEY (he), HeKLEN (he));
369 400
370 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he)); 401 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));
371 } 402 }
372 403
373 if (mg) 404 if (mg)
… …
445 if (ecb_expect_false (SvOBJECT (sv))) 476 if (ecb_expect_false (SvOBJECT (sv)))
446 { 477 {
447 HV *stash = SvSTASH (sv); 478 HV *stash = SvSTASH (sv);
448 GV *method; 479 GV *method;
449 480
481 if (enc->cbor.flags & F_FORBID_OBJECTS)
482 croak ("encountered object '%s', but forbid_objects is enabled",
483 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
450 if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0))) 484 else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
451 { 485 {
452 dSP; 486 dSP;
453 487
454 ENTER; SAVETMPS; PUSHMARK (SP); 488 ENTER; SAVETMPS;
489 PUSHMARK (SP);
455 // we re-bless the reference to get overload and other niceties right 490 // we re-bless the reference to get overload and other niceties right
456 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 491 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
457 492
458 PUTBACK; 493 PUTBACK;
459 // G_SCALAR ensures that return value is 1 494 // G_SCALAR ensures that return value is 1
… …
472 } 507 }
473 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0) 508 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
474 { 509 {
475 dSP; 510 dSP;
476 511
477 ENTER; SAVETMPS; PUSHMARK (SP); 512 ENTER; SAVETMPS;
513 SAVESTACK_POS ();
514 PUSHMARK (SP);
478 EXTEND (SP, 2); 515 EXTEND (SP, 2);
479 // we re-bless the reference to get overload and other niceties right 516 // we re-bless the reference to get overload and other niceties right
480 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 517 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
481 PUSHs (sv_cbor); 518 PUSHs (sv_cbor);
482 519
… …
488 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv) 525 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
489 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash)); 526 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
490 527
491 encode_tag (enc, CBOR_TAG_PERL_OBJECT); 528 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
492 encode_uint (enc, MAJOR_ARRAY, count + 1); 529 encode_uint (enc, MAJOR_ARRAY, count + 1);
493 encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash)); 530 encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
494 531
495 while (count) 532 while (count)
496 encode_sv (enc, SP[1 - count--]); 533 encode_sv (enc, SP[1 - count--]);
497 534
498 PUTBACK; 535 PUTBACK;
… …
557 594
558 if (SvPOKp (sv)) 595 if (SvPOKp (sv))
559 { 596 {
560 STRLEN len; 597 STRLEN len;
561 char *str = SvPV (sv, len); 598 char *str = SvPV (sv, len);
562 encode_strref (enc, SvUTF8 (sv), str, len); 599 encode_strref (enc, enc->cbor.flags & F_TEXT_STRINGS, SvUTF8 (sv), str, len);
563 } 600 }
564 else if (SvNOKp (sv)) 601 else if (SvNOKp (sv))
565 encode_nv (enc, sv); 602 encode_nv (enc, sv);
566 else if (SvIOKp (sv)) 603 else if (SvIOKp (sv))
567 { 604 {
… …
626 U32 depth; // recursion depth 663 U32 depth; // recursion depth
627 U32 maxdepth; // recursion depth limit 664 U32 maxdepth; // recursion depth limit
628 AV *shareable; 665 AV *shareable;
629 AV *stringref; 666 AV *stringref;
630 SV *decode_tagged; 667 SV *decode_tagged;
668 SV *err_sv; // optional sv for error, needs to be freed
631} dec_t; 669} dec_t;
632 670
633#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE 671// set dec->err to ERRSV
672ecb_cold static void
673err_errsv (dec_t *dec)
674{
675 if (!dec->err)
676 {
677 dec->err_sv = newSVsv (ERRSV);
634 678
635#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data") 679 // chop off the trailing \n
680 SvCUR_set (dec->err_sv, SvCUR (dec->err_sv) - 1);
681 *SvEND (dec->err_sv) = 0;
636 682
683 dec->err = SvPVutf8_nolen (dec->err_sv);
684 }
685}
686
687// the following functions are used to reduce code size and help the compiler to optimise
688ecb_cold static void
689err_set (dec_t *dec, const char *reason)
690{
691 if (!dec->err)
692 dec->err = reason;
693}
694
695ecb_cold static void
696err_unexpected_end (dec_t *dec)
697{
698 err_set (dec, "unexpected end of CBOR data");
699}
700
701ecb_cold static void
702err_nesting_exceeded (dec_t *dec)
703{
704 err_set (dec, ERR_NESTING_EXCEEDED);
705}
706
707#define ERR_DO(do) SB do; goto fail; SE
708#define ERR(reason) ERR_DO (err_set (dec, reason))
709#define ERR_ERRSV ERR_DO (err_errsv (dec))
710
711#define WANT(len) if (ecb_expect_false ((uintptr_t)(dec->end - dec->cur) < (STRLEN)len)) ERR_DO (err_unexpected_end (dec))
712
637#define DEC_INC_DEPTH if (++dec->depth > dec->cbor.max_depth) ERR (ERR_NESTING_EXCEEDED) 713#define DEC_INC_DEPTH if (ecb_expect_false (++dec->depth > dec->cbor.max_depth)) ERR (ERR_NESTING_EXCEEDED)
638#define DEC_DEC_DEPTH --dec->depth 714#define DEC_DEC_DEPTH --dec->depth
639 715
640static UV 716static UV
641decode_uint (dec_t *dec) 717decode_uint (dec_t *dec)
642{ 718{
… …
719 av_push (av, decode_sv (dec)); 795 av_push (av, decode_sv (dec));
720 } 796 }
721 } 797 }
722 else 798 else
723 { 799 {
724 int i, len = decode_uint (dec); 800 UV i, len = decode_uint (dec);
725 801
726 WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays 802 WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays
727 av_fill (av, len - 1); 803 av_fill (av, len - 1);
728 804
729 for (i = 0; i < len; ++i) 805 for (i = 0; i < len; ++i)
… …
746 // byte or utf-8 strings as keys, but only when !stringref 822 // byte or utf-8 strings as keys, but only when !stringref
747 823
748 if (ecb_expect_true (!dec->stringref)) 824 if (ecb_expect_true (!dec->stringref))
749 if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8)) 825 if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
750 { 826 {
751 I32 len = decode_uint (dec); 827 STRLEN len = decode_uint (dec);
752 char *key = (char *)dec->cur; 828 char *key = (char *)dec->cur;
753 829
830 WANT (len);
754 dec->cur += len; 831 dec->cur += len;
755 832
756 hv_store (hv, key, len, decode_sv (dec), 0); 833 hv_store (hv, key, len, decode_sv (dec), 0);
757 834
758 return; 835 return;
759 } 836 }
760 else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8)) 837 else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8))
761 { 838 {
762 I32 len = decode_uint (dec); 839 STRLEN len = decode_uint (dec);
763 char *key = (char *)dec->cur; 840 char *key = (char *)dec->cur;
764 841
842 WANT (len);
765 dec->cur += len; 843 dec->cur += len;
766 844
767 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8)) 845 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
768 if (!is_utf8_string (key, len)) 846 if (!is_utf8_string (key, len))
769 ERR ("corrupted CBOR data (invalid UTF-8 in map key)"); 847 ERR ("corrupted CBOR data (invalid UTF-8 in map key)");
… …
773 return; 851 return;
774 } 852 }
775 853
776 SV *k = decode_sv (dec); 854 SV *k = decode_sv (dec);
777 SV *v = decode_sv (dec); 855 SV *v = decode_sv (dec);
856
857 // we leak memory if uncaught exceptions are thrown by random magical
858 // methods, and this is hopefully the only place where it can happen,
859 // so if there is a chance of an exception, take the very slow path.
860 // since catching exceptions is "undocumented/internal/forbidden" by
861 // the new p5p powers, we need to call out to a perl function :/
862 if (ecb_expect_false (SvAMAGIC (k)))
863 {
864 dSP;
865
866 ENTER; SAVETMPS;
867 PUSHMARK (SP);
868 EXTEND (SP, 3);
869 PUSHs (sv_2mortal (newRV_inc ((SV *)hv)));
870 PUSHs (sv_2mortal (k));
871 PUSHs (sv_2mortal (v));
872
873 PUTBACK;
874 call_pv ("CBOR::XS::_hv_store", G_VOID | G_DISCARD | G_EVAL);
875 SPAGAIN;
876
877 FREETMPS; LEAVE;
878
879 if (SvTRUE (ERRSV))
880 ERR_ERRSV;
881
882 return;
883 }
778 884
779 hv_store_ent (hv, k, v, 0); 885 hv_store_ent (hv, k, v, 0);
780 SvREFCNT_dec (k); 886 SvREFCNT_dec (k);
781 887
782fail: 888fail:
… …
807 decode_he (dec, hv); 913 decode_he (dec, hv);
808 } 914 }
809 } 915 }
810 else 916 else
811 { 917 {
812 int pairs = decode_uint (dec); 918 UV pairs = decode_uint (dec);
919
920 WANT (pairs); // complexity check - need at least one byte per value, do not allow supersize hashes
813 921
814 while (pairs--) 922 while (pairs--)
815 decode_he (dec, hv); 923 decode_he (dec, hv);
816 } 924 }
817 925
… …
905 sv = newRV_noinc (decode_sv (dec)); 1013 sv = newRV_noinc (decode_sv (dec));
906 break; 1014 break;
907 1015
908 case CBOR_TAG_STRINGREF_NAMESPACE: 1016 case CBOR_TAG_STRINGREF_NAMESPACE:
909 { 1017 {
1018 // do nmot use SAVETMPS/FREETMPS, as these will
1019 // erase mortalised caches, e.g. "shareable"
910 ENTER; SAVETMPS; 1020 ENTER;
911 1021
912 SAVESPTR (dec->stringref); 1022 SAVESPTR (dec->stringref);
913 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ()); 1023 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ());
914 1024
915 sv = decode_sv (dec); 1025 sv = decode_sv (dec);
916 1026
917 FREETMPS; LEAVE; 1027 LEAVE;
918 } 1028 }
919 break; 1029 break;
920 1030
921 case CBOR_TAG_STRINGREF: 1031 case CBOR_TAG_STRINGREF:
922 { 1032 {
… …
973 } 1083 }
974 break; 1084 break;
975 1085
976 case CBOR_TAG_PERL_OBJECT: 1086 case CBOR_TAG_PERL_OBJECT:
977 { 1087 {
1088 if (dec->cbor.flags & F_FORBID_OBJECTS)
1089 goto filter;
1090
978 sv = decode_sv (dec); 1091 sv = decode_sv (dec);
979 1092
980 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV) 1093 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
981 ERR ("corrupted CBOR data (non-array perl object)"); 1094 ERR ("corrupted CBOR data (non-array perl object)");
982 1095
… …
992 if (!method) 1105 if (!method)
993 ERR ("cannot decode perl-object (package does not have a THAW method)"); 1106 ERR ("cannot decode perl-object (package does not have a THAW method)");
994 1107
995 dSP; 1108 dSP;
996 1109
997 ENTER; SAVETMPS; PUSHMARK (SP); 1110 ENTER; SAVETMPS;
1111 PUSHMARK (SP);
998 EXTEND (SP, len + 1); 1112 EXTEND (SP, len + 1);
999 // we re-bless the reference to get overload and other niceties right 1113 // we re-bless the reference to get overload and other niceties right
1000 PUSHs (*av_fetch (av, 0, 1)); 1114 PUSHs (*av_fetch (av, 0, 1));
1001 PUSHs (sv_cbor); 1115 PUSHs (sv_cbor);
1002 1116
… …
1010 SPAGAIN; 1124 SPAGAIN;
1011 1125
1012 if (SvTRUE (ERRSV)) 1126 if (SvTRUE (ERRSV))
1013 { 1127 {
1014 FREETMPS; LEAVE; 1128 FREETMPS; LEAVE;
1015 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); 1129 ERR_ERRSV;
1016 } 1130 }
1017 1131
1018 SvREFCNT_dec (sv); 1132 SvREFCNT_dec (sv);
1019 sv = SvREFCNT_inc (POPs); 1133 sv = SvREFCNT_inc (POPs);
1020 1134
… …
1023 FREETMPS; LEAVE; 1137 FREETMPS; LEAVE;
1024 } 1138 }
1025 break; 1139 break;
1026 1140
1027 default: 1141 default:
1142 filter:
1028 { 1143 {
1144 SV *tag_sv = newSVuv (tag);
1145
1029 sv = decode_sv (dec); 1146 sv = decode_sv (dec);
1030 1147
1031 dSP; 1148 dSP;
1032 ENTER; SAVETMPS; PUSHMARK (SP); 1149 ENTER; SAVETMPS;
1150 SAVESTACK_POS ();
1151 PUSHMARK (SP);
1033 EXTEND (SP, 2); 1152 EXTEND (SP, 2);
1034 PUSHs (newSVuv (tag)); 1153 PUSHs (tag_sv);
1035 PUSHs (sv); 1154 PUSHs (sv);
1036 1155
1037 PUTBACK; 1156 PUTBACK;
1038 int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL); 1157 int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL);
1039 SPAGAIN; 1158 SPAGAIN;
1040 1159
1041 if (SvTRUE (ERRSV)) 1160 if (SvTRUE (ERRSV))
1042 { 1161 {
1162 SvREFCNT_dec (tag_sv);
1043 FREETMPS; LEAVE; 1163 FREETMPS; LEAVE;
1044 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); 1164 ERR_ERRSV;
1045 } 1165 }
1046 1166
1047 if (count) 1167 if (count)
1048 { 1168 {
1169 SvREFCNT_dec (tag_sv);
1049 SvREFCNT_dec (sv); 1170 SvREFCNT_dec (sv);
1050 sv = SvREFCNT_inc (POPs); 1171 sv = SvREFCNT_inc (POPs);
1051 } 1172 }
1052 else 1173 else
1053 { 1174 {
1054 AV *av = newAV (); 1175 AV *av = newAV ();
1055 av_push (av, newSVuv (tag)); 1176 av_push (av, tag_sv);
1056 av_push (av, sv); 1177 av_push (av, sv);
1057 1178
1058 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 1179 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
1059 ? cbor_tagged_stash 1180 ? cbor_tagged_stash
1060 : gv_stashpv ("CBOR::XS::Tagged" , 1); 1181 : gv_stashpv ("CBOR::XS::Tagged" , 1);
… …
1189 1310
1190 if (dec.err) 1311 if (dec.err)
1191 { 1312 {
1192 if (dec.shareable) 1313 if (dec.shareable)
1193 { 1314 {
1194 // need to break cyclic links, which whould all be in shareable 1315 // need to break cyclic links, which would all be in shareable
1195 int i; 1316 int i;
1196 SV **svp; 1317 SV **svp;
1197 1318
1198 for (i = av_len (dec.shareable) + 1; i--; ) 1319 for (i = av_len (dec.shareable) + 1; i--; )
1199 if ((svp = av_fetch (dec.shareable, i, 0))) 1320 if ((svp = av_fetch (dec.shareable, i, 0)))
1200 sv_setsv (*svp, &PL_sv_undef); 1321 sv_setsv (*svp, &PL_sv_undef);
1201 } 1322 }
1202 1323
1203 SvREFCNT_dec (sv); 1324 SvREFCNT_dec (sv);
1325
1326 if (dec.err_sv)
1327 sv_2mortal (dec.err_sv);
1328
1204 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur); 1329 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur);
1205 } 1330 }
1206 1331
1207 sv = sv_2mortal (sv); 1332 sv = sv_2mortal (sv);
1208 1333
… …
1352 1477
1353 default_filter = newSVpv ("CBOR::XS::default_filter", 0); 1478 default_filter = newSVpv ("CBOR::XS::default_filter", 0);
1354 1479
1355 sv_cbor = newSVpv ("CBOR", 0); 1480 sv_cbor = newSVpv ("CBOR", 0);
1356 SvREADONLY_on (sv_cbor); 1481 SvREADONLY_on (sv_cbor);
1482
1483 assert (("STRLEN must be an unsigned type", 0 <= (STRLEN)-1));
1357} 1484}
1358 1485
1359PROTOTYPES: DISABLE 1486PROTOTYPES: DISABLE
1360 1487
1361void CLONE (...) 1488void CLONE (...)
… …
1381 ALIAS: 1508 ALIAS:
1382 shrink = F_SHRINK 1509 shrink = F_SHRINK
1383 allow_unknown = F_ALLOW_UNKNOWN 1510 allow_unknown = F_ALLOW_UNKNOWN
1384 allow_sharing = F_ALLOW_SHARING 1511 allow_sharing = F_ALLOW_SHARING
1385 allow_cycles = F_ALLOW_CYCLES 1512 allow_cycles = F_ALLOW_CYCLES
1513 forbid_objects = F_FORBID_OBJECTS
1386 pack_strings = F_PACK_STRINGS 1514 pack_strings = F_PACK_STRINGS
1515 text_keys = F_TEXT_KEYS
1516 text_strings = F_TEXT_STRINGS
1387 validate_utf8 = F_VALIDATE_UTF8 1517 validate_utf8 = F_VALIDATE_UTF8
1388 PPCODE: 1518 PPCODE:
1389{ 1519{
1390 if (enable) 1520 if (enable)
1391 self->flags |= ix; 1521 self->flags |= ix;
… …
1399 ALIAS: 1529 ALIAS:
1400 get_shrink = F_SHRINK 1530 get_shrink = F_SHRINK
1401 get_allow_unknown = F_ALLOW_UNKNOWN 1531 get_allow_unknown = F_ALLOW_UNKNOWN
1402 get_allow_sharing = F_ALLOW_SHARING 1532 get_allow_sharing = F_ALLOW_SHARING
1403 get_allow_cycles = F_ALLOW_CYCLES 1533 get_allow_cycles = F_ALLOW_CYCLES
1534 get_forbid_objects = F_FORBID_OBJECTS
1404 get_pack_strings = F_PACK_STRINGS 1535 get_pack_strings = F_PACK_STRINGS
1536 get_text_keys = F_TEXT_KEYS
1537 get_text_strings = F_TEXT_STRINGS
1405 get_validate_utf8 = F_VALIDATE_UTF8 1538 get_validate_utf8 = F_VALIDATE_UTF8
1406 PPCODE: 1539 PPCODE:
1407 XPUSHs (boolSV (self->flags & ix)); 1540 XPUSHs (boolSV (self->flags & ix));
1408 1541
1409void max_depth (CBOR *self, U32 max_depth = 0x80000000UL) 1542void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)

Diff Legend

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