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.46 by root, Sun Dec 14 05:57:22 2014 UTC vs.
Revision 1.59 by root, Fri Nov 25 23:37:27 2016 UTC

… …
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_PACK_STRINGS 0x00000010UL 104#define F_PACK_STRINGS 0x00000010UL
105#define F_TEXT_KEYS 0x00000020UL
106#define F_TEXT_STRINGS 0x00000040UL
105#define F_VALIDATE_UTF8 0x00000020UL 107#define F_VALIDATE_UTF8 0x00000080UL
106 108
107#define INIT_SIZE 32 // initial scalar size to be allocated 109#define INIT_SIZE 32 // initial scalar size to be allocated
108 110
109#define SB do { 111#define SB do {
110#define SE } while (0) 112#define SE } while (0)
… …
276encode_tag (enc_t *enc, UV tag) 278encode_tag (enc_t *enc, UV tag)
277{ 279{
278 encode_uint (enc, MAJOR_TAG, tag); 280 encode_uint (enc, MAJOR_TAG, tag);
279} 281}
280 282
283// exceptional (hopefully) slow path for byte strings that need to be utf8-encoded
284ecb_noinline static void
285encode_str_utf8 (enc_t *enc, int utf8, char *str, STRLEN len)
286{
287 STRLEN ulen = len;
288 U8 *p, *pend = (U8 *)str + len;
289
290 for (p = (U8 *)str; p < pend; ++p)
291 ulen += *p >> 7; // count set high bits
292
293 encode_uint (enc, MAJOR_TEXT, ulen);
294
295 need (enc, ulen);
296 for (p = (U8 *)str; p < pend; ++p)
297 if (*p < 0x80)
298 *enc->cur++ = *p;
299 else
300 {
301 *enc->cur++ = 0xc0 + (*p >> 6);
302 *enc->cur++ = 0x80 + (*p & 63);
303 }
304}
305
281ecb_inline void 306ecb_inline void
282encode_str (enc_t *enc, int utf8, char *str, STRLEN len) 307encode_str (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len)
283{ 308{
309 if (ecb_expect_false (upgrade_utf8))
310 if (!utf8)
311 {
312 encode_str_utf8 (enc, utf8, str, len);
313 return;
314 }
315
284 encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len); 316 encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len);
285 need (enc, len); 317 need (enc, len);
286 memcpy (enc->cur, str, len); 318 memcpy (enc->cur, str, len);
287 enc->cur += len; 319 enc->cur += len;
288} 320}
289 321
290static void 322ecb_inline void
291encode_strref (enc_t *enc, int utf8, char *str, STRLEN len) 323encode_strref (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len)
292{ 324{
293 if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS)) 325 if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS))
294 { 326 {
295 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1); 327 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);
296 328
… …
307 sv_setuv (*svp, enc->stringref_idx); 339 sv_setuv (*svp, enc->stringref_idx);
308 ++enc->stringref_idx; 340 ++enc->stringref_idx;
309 } 341 }
310 } 342 }
311 343
312 encode_str (enc, utf8, str, len); 344 encode_str (enc, upgrade_utf8, utf8, str, len);
313} 345}
314 346
315static void encode_sv (enc_t *enc, SV *sv); 347static void encode_sv (enc_t *enc, SV *sv);
316 348
317static void 349static void
… …
363 while ((he = hv_iternext (hv))) 395 while ((he = hv_iternext (hv)))
364 { 396 {
365 if (HeKLEN (he) == HEf_SVKEY) 397 if (HeKLEN (he) == HEf_SVKEY)
366 encode_sv (enc, HeSVKEY (he)); 398 encode_sv (enc, HeSVKEY (he));
367 else 399 else
368 encode_strref (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he)); 400 encode_strref (enc, enc->cbor.flags & (F_TEXT_KEYS | F_TEXT_STRINGS), HeKUTF8 (he), HeKEY (he), HeKLEN (he));
369 401
370 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he)); 402 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));
371 } 403 }
372 404
373 if (mg) 405 if (mg)
… …
449 481
450 if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0))) 482 if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
451 { 483 {
452 dSP; 484 dSP;
453 485
454 ENTER; SAVETMPS; PUSHMARK (SP); 486 ENTER; SAVETMPS;
487 PUSHMARK (SP);
455 // we re-bless the reference to get overload and other niceties right 488 // we re-bless the reference to get overload and other niceties right
456 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 489 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
457 490
458 PUTBACK; 491 PUTBACK;
459 // G_SCALAR ensures that return value is 1 492 // G_SCALAR ensures that return value is 1
… …
472 } 505 }
473 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0) 506 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
474 { 507 {
475 dSP; 508 dSP;
476 509
477 ENTER; SAVETMPS; PUSHMARK (SP); 510 ENTER; SAVETMPS;
511 SAVESTACK_POS ();
512 PUSHMARK (SP);
478 EXTEND (SP, 2); 513 EXTEND (SP, 2);
479 // we re-bless the reference to get overload and other niceties right 514 // we re-bless the reference to get overload and other niceties right
480 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 515 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
481 PUSHs (sv_cbor); 516 PUSHs (sv_cbor);
482 517
… …
488 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv) 523 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)); 524 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
490 525
491 encode_tag (enc, CBOR_TAG_PERL_OBJECT); 526 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
492 encode_uint (enc, MAJOR_ARRAY, count + 1); 527 encode_uint (enc, MAJOR_ARRAY, count + 1);
493 encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash)); 528 encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
494 529
495 while (count) 530 while (count)
496 encode_sv (enc, SP[1 - count--]); 531 encode_sv (enc, SP[1 - count--]);
497 532
498 PUTBACK; 533 PUTBACK;
… …
557 592
558 if (SvPOKp (sv)) 593 if (SvPOKp (sv))
559 { 594 {
560 STRLEN len; 595 STRLEN len;
561 char *str = SvPV (sv, len); 596 char *str = SvPV (sv, len);
562 encode_strref (enc, SvUTF8 (sv), str, len); 597 encode_strref (enc, enc->cbor.flags & F_TEXT_STRINGS, SvUTF8 (sv), str, len);
563 } 598 }
564 else if (SvNOKp (sv)) 599 else if (SvNOKp (sv))
565 encode_nv (enc, sv); 600 encode_nv (enc, sv);
566 else if (SvIOKp (sv)) 601 else if (SvIOKp (sv))
567 { 602 {
… …
584} 619}
585 620
586static SV * 621static SV *
587encode_cbor (SV *scalar, CBOR *cbor) 622encode_cbor (SV *scalar, CBOR *cbor)
588{ 623{
589 enc_t enc = { }; 624 enc_t enc = { 0 };
590 625
591 enc.cbor = *cbor; 626 enc.cbor = *cbor;
592 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 627 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
593 enc.cur = SvPVX (enc.sv); 628 enc.cur = SvPVX (enc.sv);
594 enc.end = SvEND (enc.sv); 629 enc.end = SvEND (enc.sv);
… …
626 U32 depth; // recursion depth 661 U32 depth; // recursion depth
627 U32 maxdepth; // recursion depth limit 662 U32 maxdepth; // recursion depth limit
628 AV *shareable; 663 AV *shareable;
629 AV *stringref; 664 AV *stringref;
630 SV *decode_tagged; 665 SV *decode_tagged;
666 SV *err_sv; // optional sv for error, needs to be freed
631} dec_t; 667} dec_t;
632 668
633#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE 669// set dec->err to ERRSV
670ecb_cold static void
671err_errsv (dec_t *dec)
672{
673 if (!dec->err)
674 {
675 dec->err_sv = newSVsv (ERRSV);
634 676
635#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data") 677 // chop off the trailing \n
678 SvCUR_set (dec->err_sv, SvCUR (dec->err_sv) - 1);
679 *SvEND (dec->err_sv) = 0;
636 680
681 dec->err = SvPVutf8_nolen (dec->err_sv);
682 }
683}
684
685// the following functions are used to reduce code size and help the compiler to optimise
686ecb_cold static void
687err_set (dec_t *dec, const char *reason)
688{
689 if (!dec->err)
690 dec->err = reason;
691}
692
693ecb_cold static void
694err_unexpected_end (dec_t *dec)
695{
696 err_set (dec, "unexpected end of CBOR data");
697}
698
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
706#define ERR(reason) ERR_DO (err_set (dec, reason))
707#define ERR_ERRSV ERR_DO (err_errsv (dec))
708
709#define WANT(len) if (ecb_expect_false ((UV)(dec->end - dec->cur) < (UV)len)) ERR_DO (err_unexpected_end (dec))
710
637#define DEC_INC_DEPTH if (++dec->depth > dec->cbor.max_depth) ERR (ERR_NESTING_EXCEEDED) 711#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 712#define DEC_DEC_DEPTH --dec->depth
639 713
640static UV 714static UV
641decode_uint (dec_t *dec) 715decode_uint (dec_t *dec)
642{ 716{
… …
719 av_push (av, decode_sv (dec)); 793 av_push (av, decode_sv (dec));
720 } 794 }
721 } 795 }
722 else 796 else
723 { 797 {
724 int i, len = decode_uint (dec); 798 UV i, len = decode_uint (dec);
725 799
726 WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays 800 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); 801 av_fill (av, len - 1);
728 802
729 for (i = 0; i < len; ++i) 803 for (i = 0; i < len; ++i)
… …
746 // byte or utf-8 strings as keys, but only when !stringref 820 // byte or utf-8 strings as keys, but only when !stringref
747 821
748 if (ecb_expect_true (!dec->stringref)) 822 if (ecb_expect_true (!dec->stringref))
749 if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8)) 823 if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
750 { 824 {
751 I32 len = decode_uint (dec); 825 STRLEN len = decode_uint (dec);
752 char *key = (char *)dec->cur; 826 char *key = (char *)dec->cur;
753 827
828 WANT (len);
754 dec->cur += len; 829 dec->cur += len;
755 830
756 hv_store (hv, key, len, decode_sv (dec), 0); 831 hv_store (hv, key, len, decode_sv (dec), 0);
757 832
758 return; 833 return;
759 } 834 }
760 else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8)) 835 else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8))
761 { 836 {
762 I32 len = decode_uint (dec); 837 STRLEN len = decode_uint (dec);
763 char *key = (char *)dec->cur; 838 char *key = (char *)dec->cur;
764 839
840 WANT (len);
765 dec->cur += len; 841 dec->cur += len;
766 842
767 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8)) 843 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
768 if (!is_utf8_string (key, len)) 844 if (!is_utf8_string (key, len))
769 ERR ("corrupted CBOR data (invalid UTF-8 in map key)"); 845 ERR ("corrupted CBOR data (invalid UTF-8 in map key)");
… …
773 return; 849 return;
774 } 850 }
775 851
776 SV *k = decode_sv (dec); 852 SV *k = decode_sv (dec);
777 SV *v = decode_sv (dec); 853 SV *v = decode_sv (dec);
854
855 // we leak memory if uncaught exceptions are thrown by random magical
856 // methods, and this is hopefully the only place where it can happen,
857 // so if there is a chance of an exception, take the very slow path.
858 // since catching exceptions is "undocumented/internal/forbidden" by
859 // the new p5p powers, we need to call out to a perl function :/
860 if (ecb_expect_false (SvAMAGIC (k)))
861 {
862 dSP;
863
864 ENTER; SAVETMPS;
865 PUSHMARK (SP);
866 EXTEND (SP, 3);
867 PUSHs (sv_2mortal (newRV_inc ((SV *)hv)));
868 PUSHs (sv_2mortal (k));
869 PUSHs (sv_2mortal (v));
870
871 PUTBACK;
872 call_pv ("CBOR::XS::_hv_store", G_VOID | G_DISCARD | G_EVAL);
873 SPAGAIN;
874
875 FREETMPS; LEAVE;
876
877 if (SvTRUE (ERRSV))
878 ERR_ERRSV;
879
880 return;
881 }
778 882
779 hv_store_ent (hv, k, v, 0); 883 hv_store_ent (hv, k, v, 0);
780 SvREFCNT_dec (k); 884 SvREFCNT_dec (k);
781 885
782fail: 886fail:
… …
807 decode_he (dec, hv); 911 decode_he (dec, hv);
808 } 912 }
809 } 913 }
810 else 914 else
811 { 915 {
812 int pairs = decode_uint (dec); 916 UV pairs = decode_uint (dec);
917
918 WANT (pairs); // complexity check - need at least one byte per value, do not allow supersize hashes
813 919
814 while (pairs--) 920 while (pairs--)
815 decode_he (dec, hv); 921 decode_he (dec, hv);
816 } 922 }
817 923
… …
905 sv = newRV_noinc (decode_sv (dec)); 1011 sv = newRV_noinc (decode_sv (dec));
906 break; 1012 break;
907 1013
908 case CBOR_TAG_STRINGREF_NAMESPACE: 1014 case CBOR_TAG_STRINGREF_NAMESPACE:
909 { 1015 {
1016 // do nmot use SAVETMPS/FREETMPS, as these will
1017 // erase mortalised caches, e.g. "shareable"
910 ENTER; SAVETMPS; 1018 ENTER;
911 1019
912 SAVESPTR (dec->stringref); 1020 SAVESPTR (dec->stringref);
913 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ()); 1021 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ());
914 1022
915 sv = decode_sv (dec); 1023 sv = decode_sv (dec);
916 1024
917 FREETMPS; LEAVE; 1025 LEAVE;
918 } 1026 }
919 break; 1027 break;
920 1028
921 case CBOR_TAG_STRINGREF: 1029 case CBOR_TAG_STRINGREF:
922 { 1030 {
… …
992 if (!method) 1100 if (!method)
993 ERR ("cannot decode perl-object (package does not have a THAW method)"); 1101 ERR ("cannot decode perl-object (package does not have a THAW method)");
994 1102
995 dSP; 1103 dSP;
996 1104
997 ENTER; SAVETMPS; PUSHMARK (SP); 1105 ENTER; SAVETMPS;
1106 PUSHMARK (SP);
998 EXTEND (SP, len + 1); 1107 EXTEND (SP, len + 1);
999 // we re-bless the reference to get overload and other niceties right 1108 // we re-bless the reference to get overload and other niceties right
1000 PUSHs (*av_fetch (av, 0, 1)); 1109 PUSHs (*av_fetch (av, 0, 1));
1001 PUSHs (sv_cbor); 1110 PUSHs (sv_cbor);
1002 1111
… …
1010 SPAGAIN; 1119 SPAGAIN;
1011 1120
1012 if (SvTRUE (ERRSV)) 1121 if (SvTRUE (ERRSV))
1013 { 1122 {
1014 FREETMPS; LEAVE; 1123 FREETMPS; LEAVE;
1015 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); 1124 ERR_ERRSV;
1016 } 1125 }
1017 1126
1018 SvREFCNT_dec (sv); 1127 SvREFCNT_dec (sv);
1019 sv = SvREFCNT_inc (POPs); 1128 sv = SvREFCNT_inc (POPs);
1020 1129
… …
1024 } 1133 }
1025 break; 1134 break;
1026 1135
1027 default: 1136 default:
1028 { 1137 {
1138 SV *tag_sv = newSVuv (tag);
1139
1029 sv = decode_sv (dec); 1140 sv = decode_sv (dec);
1030 1141
1031 dSP; 1142 dSP;
1032 ENTER; SAVETMPS; PUSHMARK (SP); 1143 ENTER; SAVETMPS;
1144 SAVESTACK_POS ();
1145 PUSHMARK (SP);
1033 EXTEND (SP, 2); 1146 EXTEND (SP, 2);
1034 PUSHs (newSVuv (tag)); 1147 PUSHs (tag_sv);
1035 PUSHs (sv); 1148 PUSHs (sv);
1036 1149
1037 PUTBACK; 1150 PUTBACK;
1038 int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL); 1151 int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL);
1039 SPAGAIN; 1152 SPAGAIN;
1040 1153
1041 if (SvTRUE (ERRSV)) 1154 if (SvTRUE (ERRSV))
1042 { 1155 {
1156 SvREFCNT_dec (tag_sv);
1043 FREETMPS; LEAVE; 1157 FREETMPS; LEAVE;
1044 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); 1158 ERR_ERRSV;
1045 } 1159 }
1046 1160
1047 if (count) 1161 if (count)
1048 { 1162 {
1163 SvREFCNT_dec (tag_sv);
1049 SvREFCNT_dec (sv); 1164 SvREFCNT_dec (sv);
1050 sv = SvREFCNT_inc (POPs); 1165 sv = SvREFCNT_inc (POPs);
1051 } 1166 }
1052 else 1167 else
1053 { 1168 {
1054 AV *av = newAV (); 1169 AV *av = newAV ();
1055 av_push (av, newSVuv (tag)); 1170 av_push (av, tag_sv);
1056 av_push (av, sv); 1171 av_push (av, sv);
1057 1172
1058 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 1173 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
1059 ? cbor_tagged_stash 1174 ? cbor_tagged_stash
1060 : gv_stashpv ("CBOR::XS::Tagged" , 1); 1175 : gv_stashpv ("CBOR::XS::Tagged" , 1);
… …
1163} 1278}
1164 1279
1165static SV * 1280static SV *
1166decode_cbor (SV *string, CBOR *cbor, char **offset_return) 1281decode_cbor (SV *string, CBOR *cbor, char **offset_return)
1167{ 1282{
1168 dec_t dec = { }; 1283 dec_t dec = { 0 };
1169 SV *sv; 1284 SV *sv;
1170 STRLEN len; 1285 STRLEN len;
1171 char *data = SvPVbyte (string, len); 1286 char *data = SvPVbyte (string, len);
1172 1287
1173 if (len > cbor->max_size && cbor->max_size) 1288 if (len > cbor->max_size && cbor->max_size)
… …
1189 1304
1190 if (dec.err) 1305 if (dec.err)
1191 { 1306 {
1192 if (dec.shareable) 1307 if (dec.shareable)
1193 { 1308 {
1194 // need to break cyclic links, which whould all be in shareable 1309 // need to break cyclic links, which would all be in shareable
1195 int i; 1310 int i;
1196 SV **svp; 1311 SV **svp;
1197 1312
1198 for (i = av_len (dec.shareable) + 1; i--; ) 1313 for (i = av_len (dec.shareable) + 1; i--; )
1199 if ((svp = av_fetch (dec.shareable, i, 0))) 1314 if ((svp = av_fetch (dec.shareable, i, 0)))
1200 sv_setsv (*svp, &PL_sv_undef); 1315 sv_setsv (*svp, &PL_sv_undef);
1201 } 1316 }
1202 1317
1203 SvREFCNT_dec (sv); 1318 SvREFCNT_dec (sv);
1319
1320 if (dec.err_sv)
1321 sv_2mortal (dec.err_sv);
1322
1204 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur); 1323 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur);
1205 } 1324 }
1206 1325
1207 sv = sv_2mortal (sv); 1326 sv = sv_2mortal (sv);
1208 1327
… …
1264 1383
1265 int major = *p >> MAJOR_SHIFT; 1384 int major = *p >> MAJOR_SHIFT;
1266 1385
1267 switch (major) 1386 switch (major)
1268 { 1387 {
1388 case MAJOR_TAG >> MAJOR_SHIFT:
1389 ++count; // tags merely prefix another value
1390 break;
1391
1269 case MAJOR_BYTES >> MAJOR_SHIFT: 1392 case MAJOR_BYTES >> MAJOR_SHIFT:
1270 case MAJOR_TEXT >> MAJOR_SHIFT: 1393 case MAJOR_TEXT >> MAJOR_SHIFT:
1271 case MAJOR_ARRAY >> MAJOR_SHIFT: 1394 case MAJOR_ARRAY >> MAJOR_SHIFT:
1272 case MAJOR_MAP >> MAJOR_SHIFT: 1395 case MAJOR_MAP >> MAJOR_SHIFT:
1273 { 1396 {
… …
1348 1471
1349 default_filter = newSVpv ("CBOR::XS::default_filter", 0); 1472 default_filter = newSVpv ("CBOR::XS::default_filter", 0);
1350 1473
1351 sv_cbor = newSVpv ("CBOR", 0); 1474 sv_cbor = newSVpv ("CBOR", 0);
1352 SvREADONLY_on (sv_cbor); 1475 SvREADONLY_on (sv_cbor);
1476
1477 assert (("STRLEN must be an unsigned type", 0 <= (STRLEN)-1));
1353} 1478}
1354 1479
1355PROTOTYPES: DISABLE 1480PROTOTYPES: DISABLE
1356 1481
1357void CLONE (...) 1482void CLONE (...)
… …
1378 shrink = F_SHRINK 1503 shrink = F_SHRINK
1379 allow_unknown = F_ALLOW_UNKNOWN 1504 allow_unknown = F_ALLOW_UNKNOWN
1380 allow_sharing = F_ALLOW_SHARING 1505 allow_sharing = F_ALLOW_SHARING
1381 allow_cycles = F_ALLOW_CYCLES 1506 allow_cycles = F_ALLOW_CYCLES
1382 pack_strings = F_PACK_STRINGS 1507 pack_strings = F_PACK_STRINGS
1508 text_keys = F_TEXT_KEYS
1509 text_strings = F_TEXT_STRINGS
1383 validate_utf8 = F_VALIDATE_UTF8 1510 validate_utf8 = F_VALIDATE_UTF8
1384 PPCODE: 1511 PPCODE:
1385{ 1512{
1386 if (enable) 1513 if (enable)
1387 self->flags |= ix; 1514 self->flags |= ix;
… …
1396 get_shrink = F_SHRINK 1523 get_shrink = F_SHRINK
1397 get_allow_unknown = F_ALLOW_UNKNOWN 1524 get_allow_unknown = F_ALLOW_UNKNOWN
1398 get_allow_sharing = F_ALLOW_SHARING 1525 get_allow_sharing = F_ALLOW_SHARING
1399 get_allow_cycles = F_ALLOW_CYCLES 1526 get_allow_cycles = F_ALLOW_CYCLES
1400 get_pack_strings = F_PACK_STRINGS 1527 get_pack_strings = F_PACK_STRINGS
1528 get_text_keys = F_TEXT_KEYS
1529 get_text_strings = F_TEXT_STRINGS
1401 get_validate_utf8 = F_VALIDATE_UTF8 1530 get_validate_utf8 = F_VALIDATE_UTF8
1402 PPCODE: 1531 PPCODE:
1403 XPUSHs (boolSV (self->flags & ix)); 1532 XPUSHs (boolSV (self->flags & ix));
1404 1533
1405void max_depth (CBOR *self, U32 max_depth = 0x80000000UL) 1534void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)

Diff Legend

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