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.42 by root, Tue Dec 10 15:31:40 2013 UTC vs.
Revision 1.60 by root, Sat Nov 26 00:47:02 2016 UTC

… …
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 11
12#define ECB_NO_THREADS 1
12#include "ecb.h" 13#include "ecb.h"
13 14
14// compatibility with perl <5.18 15// compatibility with perl <5.18
15#ifndef HvNAMELEN_get 16#ifndef HvNAMELEN_get
16# define HvNAMELEN_get(hv) strlen (HvNAME (hv)) 17# define HvNAMELEN_get(hv) strlen (HvNAME (hv))
… …
98 99
99#define F_SHRINK 0x00000001UL 100#define F_SHRINK 0x00000001UL
100#define F_ALLOW_UNKNOWN 0x00000002UL 101#define F_ALLOW_UNKNOWN 0x00000002UL
101#define F_ALLOW_SHARING 0x00000004UL 102#define F_ALLOW_SHARING 0x00000004UL
102#define F_ALLOW_CYCLES 0x00000008UL 103#define F_ALLOW_CYCLES 0x00000008UL
104#define F_FORBID_OBJECTS 0x00000010UL
103#define F_PACK_STRINGS 0x00000010UL 105#define F_PACK_STRINGS 0x00000020UL
106#define F_TEXT_KEYS 0x00000040UL
107#define F_TEXT_STRINGS 0x00000080UL
104#define F_VALIDATE_UTF8 0x00000020UL 108#define F_VALIDATE_UTF8 0x00000100UL
105 109
106#define INIT_SIZE 32 // initial scalar size to be allocated 110#define INIT_SIZE 32 // initial scalar size to be allocated
107 111
108#define SB do { 112#define SB do {
109#define SE } while (0) 113#define SE } while (0)
… …
275encode_tag (enc_t *enc, UV tag) 279encode_tag (enc_t *enc, UV tag)
276{ 280{
277 encode_uint (enc, MAJOR_TAG, tag); 281 encode_uint (enc, MAJOR_TAG, tag);
278} 282}
279 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
280ecb_inline void 307ecb_inline void
281encode_str (enc_t *enc, int utf8, char *str, STRLEN len) 308encode_str (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len)
282{ 309{
310 if (ecb_expect_false (upgrade_utf8))
311 if (!utf8)
312 {
313 encode_str_utf8 (enc, utf8, str, len);
314 return;
315 }
316
283 encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len); 317 encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len);
284 need (enc, len); 318 need (enc, len);
285 memcpy (enc->cur, str, len); 319 memcpy (enc->cur, str, len);
286 enc->cur += len; 320 enc->cur += len;
287} 321}
288 322
289static void 323ecb_inline void
290encode_strref (enc_t *enc, int utf8, char *str, STRLEN len) 324encode_strref (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len)
291{ 325{
292 if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS)) 326 if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS))
293 { 327 {
294 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1); 328 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);
295 329
… …
306 sv_setuv (*svp, enc->stringref_idx); 340 sv_setuv (*svp, enc->stringref_idx);
307 ++enc->stringref_idx; 341 ++enc->stringref_idx;
308 } 342 }
309 } 343 }
310 344
311 encode_str (enc, utf8, str, len); 345 encode_str (enc, upgrade_utf8, utf8, str, len);
312} 346}
313 347
314static void encode_sv (enc_t *enc, SV *sv); 348static void encode_sv (enc_t *enc, SV *sv);
315 349
316static void 350static void
… …
323 357
324 ++enc->depth; 358 ++enc->depth;
325 359
326 encode_uint (enc, MAJOR_ARRAY, len + 1); 360 encode_uint (enc, MAJOR_ARRAY, len + 1);
327 361
362 if (SvMAGICAL (av))
328 for (i = 0; i <= len; ++i) 363 for (i = 0; i <= len; ++i)
329 { 364 {
330 SV **svp = av_fetch (av, i, 0); 365 SV **svp = av_fetch (av, i, 0);
331 encode_sv (enc, svp ? *svp : &PL_sv_undef); 366 encode_sv (enc, svp ? *svp : &PL_sv_undef);
332 } 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 }
333 374
334 --enc->depth; 375 --enc->depth;
335} 376}
336 377
337static void 378static void
… …
355 while ((he = hv_iternext (hv))) 396 while ((he = hv_iternext (hv)))
356 { 397 {
357 if (HeKLEN (he) == HEf_SVKEY) 398 if (HeKLEN (he) == HEf_SVKEY)
358 encode_sv (enc, HeSVKEY (he)); 399 encode_sv (enc, HeSVKEY (he));
359 else 400 else
360 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));
361 402
362 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));
363 } 404 }
364 405
365 if (mg) 406 if (mg)
… …
437 if (ecb_expect_false (SvOBJECT (sv))) 478 if (ecb_expect_false (SvOBJECT (sv)))
438 { 479 {
439 HV *stash = SvSTASH (sv); 480 HV *stash = SvSTASH (sv);
440 GV *method; 481 GV *method;
441 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))));
442 if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0))) 486 else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
443 { 487 {
444 dSP; 488 dSP;
445 489
446 ENTER; SAVETMPS; PUSHMARK (SP); 490 ENTER; SAVETMPS;
491 PUSHMARK (SP);
447 // 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
448 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 493 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
449 494
450 PUTBACK; 495 PUTBACK;
451 // G_SCALAR ensures that return value is 1 496 // G_SCALAR ensures that return value is 1
… …
464 } 509 }
465 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0) 510 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
466 { 511 {
467 dSP; 512 dSP;
468 513
469 ENTER; SAVETMPS; PUSHMARK (SP); 514 ENTER; SAVETMPS;
515 SAVESTACK_POS ();
516 PUSHMARK (SP);
470 EXTEND (SP, 2); 517 EXTEND (SP, 2);
471 // 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
472 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 519 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
473 PUSHs (sv_cbor); 520 PUSHs (sv_cbor);
474 521
… …
480 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv) 527 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
481 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));
482 529
483 encode_tag (enc, CBOR_TAG_PERL_OBJECT); 530 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
484 encode_uint (enc, MAJOR_ARRAY, count + 1); 531 encode_uint (enc, MAJOR_ARRAY, count + 1);
485 encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash)); 532 encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
486 533
487 while (count) 534 while (count)
488 encode_sv (enc, SP[1 - count--]); 535 encode_sv (enc, SP[1 - count--]);
489 536
490 PUTBACK; 537 PUTBACK;
… …
549 596
550 if (SvPOKp (sv)) 597 if (SvPOKp (sv))
551 { 598 {
552 STRLEN len; 599 STRLEN len;
553 char *str = SvPV (sv, len); 600 char *str = SvPV (sv, len);
554 encode_strref (enc, SvUTF8 (sv), str, len); 601 encode_strref (enc, enc->cbor.flags & F_TEXT_STRINGS, SvUTF8 (sv), str, len);
555 } 602 }
556 else if (SvNOKp (sv)) 603 else if (SvNOKp (sv))
557 encode_nv (enc, sv); 604 encode_nv (enc, sv);
558 else if (SvIOKp (sv)) 605 else if (SvIOKp (sv))
559 { 606 {
… …
576} 623}
577 624
578static SV * 625static SV *
579encode_cbor (SV *scalar, CBOR *cbor) 626encode_cbor (SV *scalar, CBOR *cbor)
580{ 627{
581 enc_t enc = { }; 628 enc_t enc = { 0 };
582 629
583 enc.cbor = *cbor; 630 enc.cbor = *cbor;
584 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 631 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
585 enc.cur = SvPVX (enc.sv); 632 enc.cur = SvPVX (enc.sv);
586 enc.end = SvEND (enc.sv); 633 enc.end = SvEND (enc.sv);
… …
618 U32 depth; // recursion depth 665 U32 depth; // recursion depth
619 U32 maxdepth; // recursion depth limit 666 U32 maxdepth; // recursion depth limit
620 AV *shareable; 667 AV *shareable;
621 AV *stringref; 668 AV *stringref;
622 SV *decode_tagged; 669 SV *decode_tagged;
670 SV *err_sv; // optional sv for error, needs to be freed
623} dec_t; 671} dec_t;
624 672
625#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);
626 680
627#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;
628 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
629#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)
630#define DEC_DEC_DEPTH --dec->depth 716#define DEC_DEC_DEPTH --dec->depth
631 717
632static UV 718static UV
633decode_uint (dec_t *dec) 719decode_uint (dec_t *dec)
634{ 720{
… …
711 av_push (av, decode_sv (dec)); 797 av_push (av, decode_sv (dec));
712 } 798 }
713 } 799 }
714 else 800 else
715 { 801 {
716 int i, len = decode_uint (dec); 802 UV i, len = decode_uint (dec);
717 803
718 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
719 av_fill (av, len - 1); 805 av_fill (av, len - 1);
720 806
721 for (i = 0; i < len; ++i) 807 for (i = 0; i < len; ++i)
… …
736{ 822{
737 // for speed reasons, we specialcase single-string 823 // for speed reasons, we specialcase single-string
738 // byte or utf-8 strings as keys, but only when !stringref 824 // byte or utf-8 strings as keys, but only when !stringref
739 825
740 if (ecb_expect_true (!dec->stringref)) 826 if (ecb_expect_true (!dec->stringref))
741 if (ecb_expect_true ((*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8)) 827 if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
742 { 828 {
743 I32 len = decode_uint (dec); 829 STRLEN len = decode_uint (dec);
744 char *key = (char *)dec->cur; 830 char *key = (char *)dec->cur;
745 831
832 WANT (len);
746 dec->cur += len; 833 dec->cur += len;
747 834
748 hv_store (hv, key, len, decode_sv (dec), 0); 835 hv_store (hv, key, len, decode_sv (dec), 0);
749 836
750 return; 837 return;
751 } 838 }
752 else if (ecb_expect_true ((*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8)) 839 else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8))
753 { 840 {
754 I32 len = decode_uint (dec); 841 STRLEN len = decode_uint (dec);
755 char *key = (char *)dec->cur; 842 char *key = (char *)dec->cur;
756 843
844 WANT (len);
757 dec->cur += len; 845 dec->cur += len;
758 846
759 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8)) 847 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
760 if (!is_utf8_string (key, len)) 848 if (!is_utf8_string (key, len))
761 ERR ("corrupted CBOR data (invalid UTF-8 in map key)"); 849 ERR ("corrupted CBOR data (invalid UTF-8 in map key)");
… …
765 return; 853 return;
766 } 854 }
767 855
768 SV *k = decode_sv (dec); 856 SV *k = decode_sv (dec);
769 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 }
770 886
771 hv_store_ent (hv, k, v, 0); 887 hv_store_ent (hv, k, v, 0);
772 SvREFCNT_dec (k); 888 SvREFCNT_dec (k);
773 889
774fail: 890fail:
… …
799 decode_he (dec, hv); 915 decode_he (dec, hv);
800 } 916 }
801 } 917 }
802 else 918 else
803 { 919 {
804 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
805 923
806 while (pairs--) 924 while (pairs--)
807 decode_he (dec, hv); 925 decode_he (dec, hv);
808 } 926 }
809 927
… …
897 sv = newRV_noinc (decode_sv (dec)); 1015 sv = newRV_noinc (decode_sv (dec));
898 break; 1016 break;
899 1017
900 case CBOR_TAG_STRINGREF_NAMESPACE: 1018 case CBOR_TAG_STRINGREF_NAMESPACE:
901 { 1019 {
1020 // do nmot use SAVETMPS/FREETMPS, as these will
1021 // erase mortalised caches, e.g. "shareable"
902 ENTER; SAVETMPS; 1022 ENTER;
903 1023
904 SAVESPTR (dec->stringref); 1024 SAVESPTR (dec->stringref);
905 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ()); 1025 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ());
906 1026
907 sv = decode_sv (dec); 1027 sv = decode_sv (dec);
908 1028
909 FREETMPS; LEAVE; 1029 LEAVE;
910 } 1030 }
911 break; 1031 break;
912 1032
913 case CBOR_TAG_STRINGREF: 1033 case CBOR_TAG_STRINGREF:
914 { 1034 {
… …
965 } 1085 }
966 break; 1086 break;
967 1087
968 case CBOR_TAG_PERL_OBJECT: 1088 case CBOR_TAG_PERL_OBJECT:
969 { 1089 {
1090 if (dec->cbor.flags & F_FORBID_OBJECTS)
1091 goto filter;
1092
970 sv = decode_sv (dec); 1093 sv = decode_sv (dec);
971 1094
972 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV) 1095 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
973 ERR ("corrupted CBOR data (non-array perl object)"); 1096 ERR ("corrupted CBOR data (non-array perl object)");
974 1097
… …
984 if (!method) 1107 if (!method)
985 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)");
986 1109
987 dSP; 1110 dSP;
988 1111
989 ENTER; SAVETMPS; PUSHMARK (SP); 1112 ENTER; SAVETMPS;
1113 PUSHMARK (SP);
990 EXTEND (SP, len + 1); 1114 EXTEND (SP, len + 1);
991 // 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
992 PUSHs (*av_fetch (av, 0, 1)); 1116 PUSHs (*av_fetch (av, 0, 1));
993 PUSHs (sv_cbor); 1117 PUSHs (sv_cbor);
994 1118
… …
1002 SPAGAIN; 1126 SPAGAIN;
1003 1127
1004 if (SvTRUE (ERRSV)) 1128 if (SvTRUE (ERRSV))
1005 { 1129 {
1006 FREETMPS; LEAVE; 1130 FREETMPS; LEAVE;
1007 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); 1131 ERR_ERRSV;
1008 } 1132 }
1009 1133
1010 SvREFCNT_dec (sv); 1134 SvREFCNT_dec (sv);
1011 sv = SvREFCNT_inc (POPs); 1135 sv = SvREFCNT_inc (POPs);
1012 1136
… …
1015 FREETMPS; LEAVE; 1139 FREETMPS; LEAVE;
1016 } 1140 }
1017 break; 1141 break;
1018 1142
1019 default: 1143 default:
1144 filter:
1020 { 1145 {
1146 SV *tag_sv = newSVuv (tag);
1147
1021 sv = decode_sv (dec); 1148 sv = decode_sv (dec);
1022 1149
1023 dSP; 1150 dSP;
1024 ENTER; SAVETMPS; PUSHMARK (SP); 1151 ENTER; SAVETMPS;
1152 SAVESTACK_POS ();
1153 PUSHMARK (SP);
1025 EXTEND (SP, 2); 1154 EXTEND (SP, 2);
1026 PUSHs (newSVuv (tag)); 1155 PUSHs (tag_sv);
1027 PUSHs (sv); 1156 PUSHs (sv);
1028 1157
1029 PUTBACK; 1158 PUTBACK;
1030 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);
1031 SPAGAIN; 1160 SPAGAIN;
1032 1161
1033 if (SvTRUE (ERRSV)) 1162 if (SvTRUE (ERRSV))
1034 { 1163 {
1164 SvREFCNT_dec (tag_sv);
1035 FREETMPS; LEAVE; 1165 FREETMPS; LEAVE;
1036 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); 1166 ERR_ERRSV;
1037 } 1167 }
1038 1168
1039 if (count) 1169 if (count)
1040 { 1170 {
1171 SvREFCNT_dec (tag_sv);
1041 SvREFCNT_dec (sv); 1172 SvREFCNT_dec (sv);
1042 sv = SvREFCNT_inc (POPs); 1173 sv = SvREFCNT_inc (POPs);
1043 } 1174 }
1044 else 1175 else
1045 { 1176 {
1046 AV *av = newAV (); 1177 AV *av = newAV ();
1047 av_push (av, newSVuv (tag)); 1178 av_push (av, tag_sv);
1048 av_push (av, sv); 1179 av_push (av, sv);
1049 1180
1050 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 1181 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
1051 ? cbor_tagged_stash 1182 ? cbor_tagged_stash
1052 : gv_stashpv ("CBOR::XS::Tagged" , 1); 1183 : gv_stashpv ("CBOR::XS::Tagged" , 1);
… …
1155} 1286}
1156 1287
1157static SV * 1288static SV *
1158decode_cbor (SV *string, CBOR *cbor, char **offset_return) 1289decode_cbor (SV *string, CBOR *cbor, char **offset_return)
1159{ 1290{
1160 dec_t dec = { }; 1291 dec_t dec = { 0 };
1161 SV *sv; 1292 SV *sv;
1162 STRLEN len; 1293 STRLEN len;
1163 char *data = SvPVbyte (string, len); 1294 char *data = SvPVbyte (string, len);
1164 1295
1165 if (len > cbor->max_size && cbor->max_size) 1296 if (len > cbor->max_size && cbor->max_size)
… …
1181 1312
1182 if (dec.err) 1313 if (dec.err)
1183 { 1314 {
1184 if (dec.shareable) 1315 if (dec.shareable)
1185 { 1316 {
1186 // need to break cyclic links, which whould all be in shareable 1317 // need to break cyclic links, which would all be in shareable
1187 int i; 1318 int i;
1188 SV **svp; 1319 SV **svp;
1189 1320
1190 for (i = av_len (dec.shareable) + 1; i--; ) 1321 for (i = av_len (dec.shareable) + 1; i--; )
1191 if ((svp = av_fetch (dec.shareable, i, 0))) 1322 if ((svp = av_fetch (dec.shareable, i, 0)))
1192 sv_setsv (*svp, &PL_sv_undef); 1323 sv_setsv (*svp, &PL_sv_undef);
1193 } 1324 }
1194 1325
1195 SvREFCNT_dec (sv); 1326 SvREFCNT_dec (sv);
1327
1328 if (dec.err_sv)
1329 sv_2mortal (dec.err_sv);
1330
1196 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);
1197 } 1332 }
1198 1333
1199 sv = sv_2mortal (sv); 1334 sv = sv_2mortal (sv);
1200 1335
… …
1256 1391
1257 int major = *p >> MAJOR_SHIFT; 1392 int major = *p >> MAJOR_SHIFT;
1258 1393
1259 switch (major) 1394 switch (major)
1260 { 1395 {
1396 case MAJOR_TAG >> MAJOR_SHIFT:
1397 ++count; // tags merely prefix another value
1398 break;
1399
1261 case MAJOR_BYTES >> MAJOR_SHIFT: 1400 case MAJOR_BYTES >> MAJOR_SHIFT:
1262 case MAJOR_TEXT >> MAJOR_SHIFT: 1401 case MAJOR_TEXT >> MAJOR_SHIFT:
1263 case MAJOR_ARRAY >> MAJOR_SHIFT: 1402 case MAJOR_ARRAY >> MAJOR_SHIFT:
1264 case MAJOR_MAP >> MAJOR_SHIFT: 1403 case MAJOR_MAP >> MAJOR_SHIFT:
1265 { 1404 {
… …
1340 1479
1341 default_filter = newSVpv ("CBOR::XS::default_filter", 0); 1480 default_filter = newSVpv ("CBOR::XS::default_filter", 0);
1342 1481
1343 sv_cbor = newSVpv ("CBOR", 0); 1482 sv_cbor = newSVpv ("CBOR", 0);
1344 SvREADONLY_on (sv_cbor); 1483 SvREADONLY_on (sv_cbor);
1484
1485 assert (("STRLEN must be an unsigned type", 0 <= (STRLEN)-1));
1345} 1486}
1346 1487
1347PROTOTYPES: DISABLE 1488PROTOTYPES: DISABLE
1348 1489
1349void CLONE (...) 1490void CLONE (...)
… …
1369 ALIAS: 1510 ALIAS:
1370 shrink = F_SHRINK 1511 shrink = F_SHRINK
1371 allow_unknown = F_ALLOW_UNKNOWN 1512 allow_unknown = F_ALLOW_UNKNOWN
1372 allow_sharing = F_ALLOW_SHARING 1513 allow_sharing = F_ALLOW_SHARING
1373 allow_cycles = F_ALLOW_CYCLES 1514 allow_cycles = F_ALLOW_CYCLES
1515 forbid_objects = F_FORBID_OBJECTS
1374 pack_strings = F_PACK_STRINGS 1516 pack_strings = F_PACK_STRINGS
1517 text_keys = F_TEXT_KEYS
1518 text_strings = F_TEXT_STRINGS
1375 validate_utf8 = F_VALIDATE_UTF8 1519 validate_utf8 = F_VALIDATE_UTF8
1376 PPCODE: 1520 PPCODE:
1377{ 1521{
1378 if (enable) 1522 if (enable)
1379 self->flags |= ix; 1523 self->flags |= ix;
… …
1387 ALIAS: 1531 ALIAS:
1388 get_shrink = F_SHRINK 1532 get_shrink = F_SHRINK
1389 get_allow_unknown = F_ALLOW_UNKNOWN 1533 get_allow_unknown = F_ALLOW_UNKNOWN
1390 get_allow_sharing = F_ALLOW_SHARING 1534 get_allow_sharing = F_ALLOW_SHARING
1391 get_allow_cycles = F_ALLOW_CYCLES 1535 get_allow_cycles = F_ALLOW_CYCLES
1536 get_forbid_objects = F_FORBID_OBJECTS
1392 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
1393 get_validate_utf8 = F_VALIDATE_UTF8 1540 get_validate_utf8 = F_VALIDATE_UTF8
1394 PPCODE: 1541 PPCODE:
1395 XPUSHs (boolSV (self->flags & ix)); 1542 XPUSHs (boolSV (self->flags & ix));
1396 1543
1397void 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