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.51 by root, Sun Apr 24 13:15:19 2016 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
105#define F_UTF8_STRINGS 0x00000020UL 108#define F_TEXT_STRINGS 0x00000080UL
106#define F_VALIDATE_UTF8 0x00000040UL 109#define F_VALIDATE_UTF8 0x00000100UL
107 110
108#define INIT_SIZE 32 // initial scalar size to be allocated 111#define INIT_SIZE 32 // initial scalar size to be allocated
109 112
110#define SB do { 113#define SB do {
111#define SE } while (0) 114#define SE } while (0)
… …
184 187
185// minimum length of a string to be registered for stringref 188// minimum length of a string to be registered for stringref
186ecb_inline int 189ecb_inline int
187minimum_string_length (UV idx) 190minimum_string_length (UV idx)
188{ 191{
189 return idx > 23 192 return idx <= 23 ? 3
190 ? idx > 0xffU 193 : idx <= 0xffU ? 4
191 ? idx > 0xffffU 194 : idx <= 0xffffU ? 5
192 ? idx > 0xffffffffU 195 : idx <= 0xffffffffU ? 7
193 ? 11 196 : 11;
194 : 7
195 : 5
196 : 4
197 : 3;
198} 197}
199 198
200///////////////////////////////////////////////////////////////////////////// 199/////////////////////////////////////////////////////////////////////////////
201// encoder 200// encoder
202 201
… …
215} enc_t; 214} enc_t;
216 215
217ecb_inline void 216ecb_inline void
218need (enc_t *enc, STRLEN len) 217need (enc_t *enc, STRLEN len)
219{ 218{
220 if (ecb_expect_false (enc->cur + len >= enc->end)) 219 if (ecb_expect_false ((uintptr_t)(enc->end - enc->cur) < len))
221 { 220 {
222 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 221 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
223 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 222 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
224 enc->cur = SvPVX (enc->sv) + cur; 223 enc->cur = SvPVX (enc->sv) + cur;
225 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 224 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
… …
277encode_tag (enc_t *enc, UV tag) 276encode_tag (enc_t *enc, UV tag)
278{ 277{
279 encode_uint (enc, MAJOR_TAG, tag); 278 encode_uint (enc, MAJOR_TAG, tag);
280} 279}
281 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
282ecb_inline void 304ecb_inline void
283encode_str (enc_t *enc, int utf8, char *str, STRLEN len) 305encode_str (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len)
284{ 306{
285 if (ecb_expect_false (enc->cbor.flags & F_UTF8_STRINGS)) 307 if (ecb_expect_false (upgrade_utf8))
286 if (!utf8) 308 if (!utf8)
287 { 309 {
288 SV *sv = sv_newmortal ();
289 char *s; STRLEN l;
290
291 sv_setpvn (sv, str, len);
292
293 s = SvPVutf8 (sv, l);
294 encode_str (enc, 1, s, l); 310 encode_str_utf8 (enc, utf8, str, len);
295 return; 311 return;
296 } 312 }
297 313
298 encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len); 314 encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len);
299 need (enc, len); 315 need (enc, len);
300 memcpy (enc->cur, str, len); 316 memcpy (enc->cur, str, len);
301 enc->cur += len; 317 enc->cur += len;
302} 318}
303 319
304static void 320ecb_inline void
305encode_strref (enc_t *enc, int utf8, char *str, STRLEN len) 321encode_strref (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len)
306{ 322{
307 if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS)) 323 if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS))
308 { 324 {
309 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1); 325 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);
310 326
… …
321 sv_setuv (*svp, enc->stringref_idx); 337 sv_setuv (*svp, enc->stringref_idx);
322 ++enc->stringref_idx; 338 ++enc->stringref_idx;
323 } 339 }
324 } 340 }
325 341
326 encode_str (enc, utf8, str, len); 342 encode_str (enc, upgrade_utf8, utf8, str, len);
327} 343}
328 344
329static void encode_sv (enc_t *enc, SV *sv); 345static void encode_sv (enc_t *enc, SV *sv);
330 346
331static void 347static void
… …
377 while ((he = hv_iternext (hv))) 393 while ((he = hv_iternext (hv)))
378 { 394 {
379 if (HeKLEN (he) == HEf_SVKEY) 395 if (HeKLEN (he) == HEf_SVKEY)
380 encode_sv (enc, HeSVKEY (he)); 396 encode_sv (enc, HeSVKEY (he));
381 else 397 else
382 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));
383 399
384 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));
385 } 401 }
386 402
387 if (mg) 403 if (mg)
… …
459 if (ecb_expect_false (SvOBJECT (sv))) 475 if (ecb_expect_false (SvOBJECT (sv)))
460 { 476 {
461 HV *stash = SvSTASH (sv); 477 HV *stash = SvSTASH (sv);
462 GV *method; 478 GV *method;
463 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))));
464 if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0))) 483 else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
465 { 484 {
466 dSP; 485 dSP;
467 486
468 ENTER; SAVETMPS; 487 ENTER; SAVETMPS;
469 PUSHMARK (SP); 488 PUSHMARK (SP);
… …
505 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv) 524 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
506 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));
507 526
508 encode_tag (enc, CBOR_TAG_PERL_OBJECT); 527 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
509 encode_uint (enc, MAJOR_ARRAY, count + 1); 528 encode_uint (enc, MAJOR_ARRAY, count + 1);
510 encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash)); 529 encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
511 530
512 while (count) 531 while (count)
513 encode_sv (enc, SP[1 - count--]); 532 encode_sv (enc, SP[1 - count--]);
514 533
515 PUTBACK; 534 PUTBACK;
… …
574 593
575 if (SvPOKp (sv)) 594 if (SvPOKp (sv))
576 { 595 {
577 STRLEN len; 596 STRLEN len;
578 char *str = SvPV (sv, len); 597 char *str = SvPV (sv, len);
579 encode_strref (enc, SvUTF8 (sv), str, len); 598 encode_strref (enc, enc->cbor.flags & F_TEXT_STRINGS, SvUTF8 (sv), str, len);
580 } 599 }
581 else if (SvNOKp (sv)) 600 else if (SvNOKp (sv))
582 encode_nv (enc, sv); 601 encode_nv (enc, sv);
583 else if (SvIOKp (sv)) 602 else if (SvIOKp (sv))
584 { 603 {
… …
643 U32 depth; // recursion depth 662 U32 depth; // recursion depth
644 U32 maxdepth; // recursion depth limit 663 U32 maxdepth; // recursion depth limit
645 AV *shareable; 664 AV *shareable;
646 AV *stringref; 665 AV *stringref;
647 SV *decode_tagged; 666 SV *decode_tagged;
667 SV *err_sv; // optional sv for error, needs to be freed
648} dec_t; 668} dec_t;
649 669
650#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);
651 677
652#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;
653 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
654#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)
655#define DEC_DEC_DEPTH --dec->depth 713#define DEC_DEC_DEPTH --dec->depth
656 714
657static UV 715static UV
658decode_uint (dec_t *dec) 716decode_uint (dec_t *dec)
659{ 717{
… …
736 av_push (av, decode_sv (dec)); 794 av_push (av, decode_sv (dec));
737 } 795 }
738 } 796 }
739 else 797 else
740 { 798 {
741 int i, len = decode_uint (dec); 799 UV i, len = decode_uint (dec);
742 800
743 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
744 av_fill (av, len - 1); 802 av_fill (av, len - 1);
745 803
746 for (i = 0; i < len; ++i) 804 for (i = 0; i < len; ++i)
… …
763 // byte or utf-8 strings as keys, but only when !stringref 821 // byte or utf-8 strings as keys, but only when !stringref
764 822
765 if (ecb_expect_true (!dec->stringref)) 823 if (ecb_expect_true (!dec->stringref))
766 if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8)) 824 if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
767 { 825 {
768 I32 len = decode_uint (dec); 826 STRLEN len = decode_uint (dec);
769 char *key = (char *)dec->cur; 827 char *key = (char *)dec->cur;
770 828
771 WANT (len); 829 WANT (len);
772 dec->cur += len; 830 dec->cur += len;
773 831
… …
775 833
776 return; 834 return;
777 } 835 }
778 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))
779 { 837 {
780 I32 len = decode_uint (dec); 838 STRLEN len = decode_uint (dec);
781 char *key = (char *)dec->cur; 839 char *key = (char *)dec->cur;
782 840
783 WANT (len); 841 WANT (len);
784 dec->cur += len; 842 dec->cur += len;
785 843
… …
792 return; 850 return;
793 } 851 }
794 852
795 SV *k = decode_sv (dec); 853 SV *k = decode_sv (dec);
796 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 }
797 883
798 hv_store_ent (hv, k, v, 0); 884 hv_store_ent (hv, k, v, 0);
799 SvREFCNT_dec (k); 885 SvREFCNT_dec (k);
800 886
801fail: 887fail:
… …
826 decode_he (dec, hv); 912 decode_he (dec, hv);
827 } 913 }
828 } 914 }
829 else 915 else
830 { 916 {
831 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
832 920
833 while (pairs--) 921 while (pairs--)
834 decode_he (dec, hv); 922 decode_he (dec, hv);
835 } 923 }
836 924
… …
924 sv = newRV_noinc (decode_sv (dec)); 1012 sv = newRV_noinc (decode_sv (dec));
925 break; 1013 break;
926 1014
927 case CBOR_TAG_STRINGREF_NAMESPACE: 1015 case CBOR_TAG_STRINGREF_NAMESPACE:
928 { 1016 {
1017 // do nmot use SAVETMPS/FREETMPS, as these will
1018 // erase mortalised caches, e.g. "shareable"
929 ENTER; SAVETMPS; 1019 ENTER;
930 1020
931 SAVESPTR (dec->stringref); 1021 SAVESPTR (dec->stringref);
932 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ()); 1022 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ());
933 1023
934 sv = decode_sv (dec); 1024 sv = decode_sv (dec);
935 1025
936 FREETMPS; LEAVE; 1026 LEAVE;
937 } 1027 }
938 break; 1028 break;
939 1029
940 case CBOR_TAG_STRINGREF: 1030 case CBOR_TAG_STRINGREF:
941 { 1031 {
… …
992 } 1082 }
993 break; 1083 break;
994 1084
995 case CBOR_TAG_PERL_OBJECT: 1085 case CBOR_TAG_PERL_OBJECT:
996 { 1086 {
1087 if (dec->cbor.flags & F_FORBID_OBJECTS)
1088 goto filter;
1089
997 sv = decode_sv (dec); 1090 sv = decode_sv (dec);
998 1091
999 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV) 1092 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
1000 ERR ("corrupted CBOR data (non-array perl object)"); 1093 ERR ("corrupted CBOR data (non-array perl object)");
1001 1094
… …
1030 SPAGAIN; 1123 SPAGAIN;
1031 1124
1032 if (SvTRUE (ERRSV)) 1125 if (SvTRUE (ERRSV))
1033 { 1126 {
1034 FREETMPS; LEAVE; 1127 FREETMPS; LEAVE;
1035 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); 1128 ERR_ERRSV;
1036 } 1129 }
1037 1130
1038 SvREFCNT_dec (sv); 1131 SvREFCNT_dec (sv);
1039 sv = SvREFCNT_inc (POPs); 1132 sv = SvREFCNT_inc (POPs);
1040 1133
… …
1043 FREETMPS; LEAVE; 1136 FREETMPS; LEAVE;
1044 } 1137 }
1045 break; 1138 break;
1046 1139
1047 default: 1140 default:
1141 filter:
1048 { 1142 {
1143 SV *tag_sv = newSVuv (tag);
1144
1049 sv = decode_sv (dec); 1145 sv = decode_sv (dec);
1050 1146
1051 dSP; 1147 dSP;
1052 ENTER; SAVETMPS; 1148 ENTER; SAVETMPS;
1053 SAVESTACK_POS (); 1149 SAVESTACK_POS ();
1054 PUSHMARK (SP); 1150 PUSHMARK (SP);
1055 EXTEND (SP, 2); 1151 EXTEND (SP, 2);
1056 PUSHs (newSVuv (tag)); 1152 PUSHs (tag_sv);
1057 PUSHs (sv); 1153 PUSHs (sv);
1058 1154
1059 PUTBACK; 1155 PUTBACK;
1060 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);
1061 SPAGAIN; 1157 SPAGAIN;
1062 1158
1063 if (SvTRUE (ERRSV)) 1159 if (SvTRUE (ERRSV))
1064 { 1160 {
1161 SvREFCNT_dec (tag_sv);
1065 FREETMPS; LEAVE; 1162 FREETMPS; LEAVE;
1066 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); 1163 ERR_ERRSV;
1067 } 1164 }
1068 1165
1069 if (count) 1166 if (count)
1070 { 1167 {
1168 SvREFCNT_dec (tag_sv);
1071 SvREFCNT_dec (sv); 1169 SvREFCNT_dec (sv);
1072 sv = SvREFCNT_inc (POPs); 1170 sv = SvREFCNT_inc (POPs);
1073 } 1171 }
1074 else 1172 else
1075 { 1173 {
1076 AV *av = newAV (); 1174 AV *av = newAV ();
1077 av_push (av, newSVuv (tag)); 1175 av_push (av, tag_sv);
1078 av_push (av, sv); 1176 av_push (av, sv);
1079 1177
1080 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 1178 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
1081 ? cbor_tagged_stash 1179 ? cbor_tagged_stash
1082 : gv_stashpv ("CBOR::XS::Tagged" , 1); 1180 : gv_stashpv ("CBOR::XS::Tagged" , 1);
… …
1211 1309
1212 if (dec.err) 1310 if (dec.err)
1213 { 1311 {
1214 if (dec.shareable) 1312 if (dec.shareable)
1215 { 1313 {
1216 // need to break cyclic links, which whould all be in shareable 1314 // need to break cyclic links, which would all be in shareable
1217 int i; 1315 int i;
1218 SV **svp; 1316 SV **svp;
1219 1317
1220 for (i = av_len (dec.shareable) + 1; i--; ) 1318 for (i = av_len (dec.shareable) + 1; i--; )
1221 if ((svp = av_fetch (dec.shareable, i, 0))) 1319 if ((svp = av_fetch (dec.shareable, i, 0)))
1222 sv_setsv (*svp, &PL_sv_undef); 1320 sv_setsv (*svp, &PL_sv_undef);
1223 } 1321 }
1224 1322
1225 SvREFCNT_dec (sv); 1323 SvREFCNT_dec (sv);
1324
1325 if (dec.err_sv)
1326 sv_2mortal (dec.err_sv);
1327
1226 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);
1227 } 1329 }
1228 1330
1229 sv = sv_2mortal (sv); 1331 sv = sv_2mortal (sv);
1230 1332
… …
1374 1476
1375 default_filter = newSVpv ("CBOR::XS::default_filter", 0); 1477 default_filter = newSVpv ("CBOR::XS::default_filter", 0);
1376 1478
1377 sv_cbor = newSVpv ("CBOR", 0); 1479 sv_cbor = newSVpv ("CBOR", 0);
1378 SvREADONLY_on (sv_cbor); 1480 SvREADONLY_on (sv_cbor);
1481
1482 assert (("STRLEN must be an unsigned type", 0 <= (STRLEN)-1));
1379} 1483}
1380 1484
1381PROTOTYPES: DISABLE 1485PROTOTYPES: DISABLE
1382 1486
1383void CLONE (...) 1487void CLONE (...)
… …
1403 ALIAS: 1507 ALIAS:
1404 shrink = F_SHRINK 1508 shrink = F_SHRINK
1405 allow_unknown = F_ALLOW_UNKNOWN 1509 allow_unknown = F_ALLOW_UNKNOWN
1406 allow_sharing = F_ALLOW_SHARING 1510 allow_sharing = F_ALLOW_SHARING
1407 allow_cycles = F_ALLOW_CYCLES 1511 allow_cycles = F_ALLOW_CYCLES
1512 forbid_objects = F_FORBID_OBJECTS
1408 pack_strings = F_PACK_STRINGS 1513 pack_strings = F_PACK_STRINGS
1514 text_keys = F_TEXT_KEYS
1409 utf8_strings = F_UTF8_STRINGS 1515 text_strings = F_TEXT_STRINGS
1410 validate_utf8 = F_VALIDATE_UTF8 1516 validate_utf8 = F_VALIDATE_UTF8
1411 PPCODE: 1517 PPCODE:
1412{ 1518{
1413 if (enable) 1519 if (enable)
1414 self->flags |= ix; 1520 self->flags |= ix;
… …
1422 ALIAS: 1528 ALIAS:
1423 get_shrink = F_SHRINK 1529 get_shrink = F_SHRINK
1424 get_allow_unknown = F_ALLOW_UNKNOWN 1530 get_allow_unknown = F_ALLOW_UNKNOWN
1425 get_allow_sharing = F_ALLOW_SHARING 1531 get_allow_sharing = F_ALLOW_SHARING
1426 get_allow_cycles = F_ALLOW_CYCLES 1532 get_allow_cycles = F_ALLOW_CYCLES
1533 get_forbid_objects = F_FORBID_OBJECTS
1427 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
1428 get_validate_utf8 = F_VALIDATE_UTF8 1537 get_validate_utf8 = F_VALIDATE_UTF8
1429 PPCODE: 1538 PPCODE:
1430 XPUSHs (boolSV (self->flags & ix)); 1539 XPUSHs (boolSV (self->flags & ix));
1431 1540
1432void 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