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.56 by root, Fri Nov 25 11:33:03 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
105#define F_TEXT_KEYS 0x00000020UL 107#define F_TEXT_KEYS 0x00000040UL
106#define F_TEXT_STRINGS 0x00000040UL 108#define F_TEXT_STRINGS 0x00000080UL
107#define F_VALIDATE_UTF8 0x00000080UL 109#define F_VALIDATE_UTF8 0x00000100UL
108 110
109#define INIT_SIZE 32 // initial scalar size to be allocated 111#define INIT_SIZE 32 // initial scalar size to be allocated
110 112
111#define SB do { 113#define SB do {
112#define SE } while (0) 114#define SE } while (0)
… …
185 187
186// minimum length of a string to be registered for stringref 188// minimum length of a string to be registered for stringref
187ecb_inline int 189ecb_inline int
188minimum_string_length (UV idx) 190minimum_string_length (UV idx)
189{ 191{
190 return idx > 23 192 return idx <= 23 ? 3
191 ? idx > 0xffU 193 : idx <= 0xffU ? 4
192 ? idx > 0xffffU 194 : idx <= 0xffffU ? 5
193 ? idx > 0xffffffffU 195 : idx <= 0xffffffffU ? 7
194 ? 11 196 : 11;
195 : 7
196 : 5
197 : 4
198 : 3;
199} 197}
200 198
201///////////////////////////////////////////////////////////////////////////// 199/////////////////////////////////////////////////////////////////////////////
202// encoder 200// encoder
203 201
… …
216} enc_t; 214} enc_t;
217 215
218ecb_inline void 216ecb_inline void
219need (enc_t *enc, STRLEN len) 217need (enc_t *enc, STRLEN len)
220{ 218{
221 if (ecb_expect_false (enc->cur + len >= enc->end)) 219 if (ecb_expect_false ((uintptr_t)(enc->end - enc->cur) < len))
222 { 220 {
223 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 221 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
224 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 222 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
225 enc->cur = SvPVX (enc->sv) + cur; 223 enc->cur = SvPVX (enc->sv) + cur;
226 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 224 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
… …
477 if (ecb_expect_false (SvOBJECT (sv))) 475 if (ecb_expect_false (SvOBJECT (sv)))
478 { 476 {
479 HV *stash = SvSTASH (sv); 477 HV *stash = SvSTASH (sv);
480 GV *method; 478 GV *method;
481 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))));
482 if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0))) 483 else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
483 { 484 {
484 dSP; 485 dSP;
485 486
486 ENTER; SAVETMPS; 487 ENTER; SAVETMPS;
487 PUSHMARK (SP); 488 PUSHMARK (SP);
… …
661 U32 depth; // recursion depth 662 U32 depth; // recursion depth
662 U32 maxdepth; // recursion depth limit 663 U32 maxdepth; // recursion depth limit
663 AV *shareable; 664 AV *shareable;
664 AV *stringref; 665 AV *stringref;
665 SV *decode_tagged; 666 SV *decode_tagged;
667 SV *err_sv; // optional sv for error, needs to be freed
666} dec_t; 668} dec_t;
667 669
668#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);
669 677
670#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;
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))
671 711
672#define DEC_INC_DEPTH if (ecb_expect_false (++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)
673#define DEC_DEC_DEPTH --dec->depth 713#define DEC_DEC_DEPTH --dec->depth
674 714
675static UV 715static UV
… …
754 av_push (av, decode_sv (dec)); 794 av_push (av, decode_sv (dec));
755 } 795 }
756 } 796 }
757 else 797 else
758 { 798 {
759 int i, len = decode_uint (dec); 799 UV i, len = decode_uint (dec);
760 800
761 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
762 av_fill (av, len - 1); 802 av_fill (av, len - 1);
763 803
764 for (i = 0; i < len; ++i) 804 for (i = 0; i < len; ++i)
… …
811 } 851 }
812 852
813 SV *k = decode_sv (dec); 853 SV *k = decode_sv (dec);
814 SV *v = decode_sv (dec); 854 SV *v = decode_sv (dec);
815 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 }
883
816 hv_store_ent (hv, k, v, 0); 884 hv_store_ent (hv, k, v, 0);
817 SvREFCNT_dec (k); 885 SvREFCNT_dec (k);
818 886
819fail: 887fail:
820 ; 888 ;
… …
844 decode_he (dec, hv); 912 decode_he (dec, hv);
845 } 913 }
846 } 914 }
847 else 915 else
848 { 916 {
849 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
850 920
851 while (pairs--) 921 while (pairs--)
852 decode_he (dec, hv); 922 decode_he (dec, hv);
853 } 923 }
854 924
… …
1012 } 1082 }
1013 break; 1083 break;
1014 1084
1015 case CBOR_TAG_PERL_OBJECT: 1085 case CBOR_TAG_PERL_OBJECT:
1016 { 1086 {
1087 if (dec->cbor.flags & F_FORBID_OBJECTS)
1088 goto filter;
1089
1017 sv = decode_sv (dec); 1090 sv = decode_sv (dec);
1018 1091
1019 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV) 1092 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
1020 ERR ("corrupted CBOR data (non-array perl object)"); 1093 ERR ("corrupted CBOR data (non-array perl object)");
1021 1094
… …
1050 SPAGAIN; 1123 SPAGAIN;
1051 1124
1052 if (SvTRUE (ERRSV)) 1125 if (SvTRUE (ERRSV))
1053 { 1126 {
1054 FREETMPS; LEAVE; 1127 FREETMPS; LEAVE;
1055 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); 1128 ERR_ERRSV;
1056 } 1129 }
1057 1130
1058 SvREFCNT_dec (sv); 1131 SvREFCNT_dec (sv);
1059 sv = SvREFCNT_inc (POPs); 1132 sv = SvREFCNT_inc (POPs);
1060 1133
… …
1063 FREETMPS; LEAVE; 1136 FREETMPS; LEAVE;
1064 } 1137 }
1065 break; 1138 break;
1066 1139
1067 default: 1140 default:
1141 filter:
1068 { 1142 {
1143 SV *tag_sv = newSVuv (tag);
1144
1069 sv = decode_sv (dec); 1145 sv = decode_sv (dec);
1070 1146
1071 dSP; 1147 dSP;
1072 ENTER; SAVETMPS; 1148 ENTER; SAVETMPS;
1073 SAVESTACK_POS (); 1149 SAVESTACK_POS ();
1074 PUSHMARK (SP); 1150 PUSHMARK (SP);
1075 EXTEND (SP, 2); 1151 EXTEND (SP, 2);
1076 PUSHs (newSVuv (tag)); 1152 PUSHs (tag_sv);
1077 PUSHs (sv); 1153 PUSHs (sv);
1078 1154
1079 PUTBACK; 1155 PUTBACK;
1080 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);
1081 SPAGAIN; 1157 SPAGAIN;
1082 1158
1083 if (SvTRUE (ERRSV)) 1159 if (SvTRUE (ERRSV))
1084 { 1160 {
1161 SvREFCNT_dec (tag_sv);
1085 FREETMPS; LEAVE; 1162 FREETMPS; LEAVE;
1086 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); 1163 ERR_ERRSV;
1087 } 1164 }
1088 1165
1089 if (count) 1166 if (count)
1090 { 1167 {
1168 SvREFCNT_dec (tag_sv);
1091 SvREFCNT_dec (sv); 1169 SvREFCNT_dec (sv);
1092 sv = SvREFCNT_inc (POPs); 1170 sv = SvREFCNT_inc (POPs);
1093 } 1171 }
1094 else 1172 else
1095 { 1173 {
1096 AV *av = newAV (); 1174 AV *av = newAV ();
1097 av_push (av, newSVuv (tag)); 1175 av_push (av, tag_sv);
1098 av_push (av, sv); 1176 av_push (av, sv);
1099 1177
1100 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 1178 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
1101 ? cbor_tagged_stash 1179 ? cbor_tagged_stash
1102 : gv_stashpv ("CBOR::XS::Tagged" , 1); 1180 : gv_stashpv ("CBOR::XS::Tagged" , 1);
… …
1231 1309
1232 if (dec.err) 1310 if (dec.err)
1233 { 1311 {
1234 if (dec.shareable) 1312 if (dec.shareable)
1235 { 1313 {
1236 // need to break cyclic links, which whould all be in shareable 1314 // need to break cyclic links, which would all be in shareable
1237 int i; 1315 int i;
1238 SV **svp; 1316 SV **svp;
1239 1317
1240 for (i = av_len (dec.shareable) + 1; i--; ) 1318 for (i = av_len (dec.shareable) + 1; i--; )
1241 if ((svp = av_fetch (dec.shareable, i, 0))) 1319 if ((svp = av_fetch (dec.shareable, i, 0)))
1242 sv_setsv (*svp, &PL_sv_undef); 1320 sv_setsv (*svp, &PL_sv_undef);
1243 } 1321 }
1244 1322
1245 SvREFCNT_dec (sv); 1323 SvREFCNT_dec (sv);
1324
1325 if (dec.err_sv)
1326 sv_2mortal (dec.err_sv);
1327
1246 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);
1247 } 1329 }
1248 1330
1249 sv = sv_2mortal (sv); 1331 sv = sv_2mortal (sv);
1250 1332
… …
1425 ALIAS: 1507 ALIAS:
1426 shrink = F_SHRINK 1508 shrink = F_SHRINK
1427 allow_unknown = F_ALLOW_UNKNOWN 1509 allow_unknown = F_ALLOW_UNKNOWN
1428 allow_sharing = F_ALLOW_SHARING 1510 allow_sharing = F_ALLOW_SHARING
1429 allow_cycles = F_ALLOW_CYCLES 1511 allow_cycles = F_ALLOW_CYCLES
1512 forbid_objects = F_FORBID_OBJECTS
1430 pack_strings = F_PACK_STRINGS 1513 pack_strings = F_PACK_STRINGS
1431 text_keys = F_TEXT_KEYS 1514 text_keys = F_TEXT_KEYS
1432 text_strings = F_TEXT_STRINGS 1515 text_strings = F_TEXT_STRINGS
1433 validate_utf8 = F_VALIDATE_UTF8 1516 validate_utf8 = F_VALIDATE_UTF8
1434 PPCODE: 1517 PPCODE:
… …
1445 ALIAS: 1528 ALIAS:
1446 get_shrink = F_SHRINK 1529 get_shrink = F_SHRINK
1447 get_allow_unknown = F_ALLOW_UNKNOWN 1530 get_allow_unknown = F_ALLOW_UNKNOWN
1448 get_allow_sharing = F_ALLOW_SHARING 1531 get_allow_sharing = F_ALLOW_SHARING
1449 get_allow_cycles = F_ALLOW_CYCLES 1532 get_allow_cycles = F_ALLOW_CYCLES
1533 get_forbid_objects = F_FORBID_OBJECTS
1450 get_pack_strings = F_PACK_STRINGS 1534 get_pack_strings = F_PACK_STRINGS
1451 get_text_keys = F_TEXT_KEYS 1535 get_text_keys = F_TEXT_KEYS
1452 get_text_strings = F_TEXT_STRINGS 1536 get_text_strings = F_TEXT_STRINGS
1453 get_validate_utf8 = F_VALIDATE_UTF8 1537 get_validate_utf8 = F_VALIDATE_UTF8
1454 PPCODE: 1538 PPCODE:

Diff Legend

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