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.57 by root, Fri Nov 25 12:16:12 2016 UTC vs.
Revision 1.59 by root, Fri Nov 25 23:37:27 2016 UTC

… …
661 U32 depth; // recursion depth 661 U32 depth; // recursion depth
662 U32 maxdepth; // recursion depth limit 662 U32 maxdepth; // recursion depth limit
663 AV *shareable; 663 AV *shareable;
664 AV *stringref; 664 AV *stringref;
665 SV *decode_tagged; 665 SV *decode_tagged;
666 SV *err_sv; // optional sv for error, needs to be freed
666} dec_t; 667} dec_t;
667 668
668#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);
669 676
677 // chop off the trailing \n
678 SvCUR_set (dec->err_sv, SvCUR (dec->err_sv) - 1);
679 *SvEND (dec->err_sv) = 0;
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
670#define WANT(len) if (ecb_expect_false ((UV)(dec->end - dec->cur) < (UV)len)) ERR ("unexpected end of CBOR data") 709#define WANT(len) if (ecb_expect_false ((UV)(dec->end - dec->cur) < (UV)len)) ERR_DO (err_unexpected_end (dec))
671 710
672#define DEC_INC_DEPTH if (ecb_expect_false (++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)
673#define DEC_DEC_DEPTH --dec->depth 712#define DEC_DEC_DEPTH --dec->depth
674 713
675static UV 714static UV
… …
811 } 850 }
812 851
813 SV *k = decode_sv (dec); 852 SV *k = decode_sv (dec);
814 SV *v = decode_sv (dec); 853 SV *v = decode_sv (dec);
815 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 }
882
816 hv_store_ent (hv, k, v, 0); 883 hv_store_ent (hv, k, v, 0);
817 SvREFCNT_dec (k); 884 SvREFCNT_dec (k);
818 885
819fail: 886fail:
820 ; 887 ;
… …
1052 SPAGAIN; 1119 SPAGAIN;
1053 1120
1054 if (SvTRUE (ERRSV)) 1121 if (SvTRUE (ERRSV))
1055 { 1122 {
1056 FREETMPS; LEAVE; 1123 FREETMPS; LEAVE;
1057 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); 1124 ERR_ERRSV;
1058 } 1125 }
1059 1126
1060 SvREFCNT_dec (sv); 1127 SvREFCNT_dec (sv);
1061 sv = SvREFCNT_inc (POPs); 1128 sv = SvREFCNT_inc (POPs);
1062 1129
… …
1066 } 1133 }
1067 break; 1134 break;
1068 1135
1069 default: 1136 default:
1070 { 1137 {
1138 SV *tag_sv = newSVuv (tag);
1139
1071 sv = decode_sv (dec); 1140 sv = decode_sv (dec);
1072 1141
1073 dSP; 1142 dSP;
1074 ENTER; SAVETMPS; 1143 ENTER; SAVETMPS;
1075 SAVESTACK_POS (); 1144 SAVESTACK_POS ();
1076 PUSHMARK (SP); 1145 PUSHMARK (SP);
1077 EXTEND (SP, 2); 1146 EXTEND (SP, 2);
1078 PUSHs (newSVuv (tag)); 1147 PUSHs (tag_sv);
1079 PUSHs (sv); 1148 PUSHs (sv);
1080 1149
1081 PUTBACK; 1150 PUTBACK;
1082 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);
1083 SPAGAIN; 1152 SPAGAIN;
1084 1153
1085 if (SvTRUE (ERRSV)) 1154 if (SvTRUE (ERRSV))
1086 { 1155 {
1156 SvREFCNT_dec (tag_sv);
1087 FREETMPS; LEAVE; 1157 FREETMPS; LEAVE;
1088 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); 1158 ERR_ERRSV;
1089 } 1159 }
1090 1160
1091 if (count) 1161 if (count)
1092 { 1162 {
1163 SvREFCNT_dec (tag_sv);
1093 SvREFCNT_dec (sv); 1164 SvREFCNT_dec (sv);
1094 sv = SvREFCNT_inc (POPs); 1165 sv = SvREFCNT_inc (POPs);
1095 } 1166 }
1096 else 1167 else
1097 { 1168 {
1098 AV *av = newAV (); 1169 AV *av = newAV ();
1099 av_push (av, newSVuv (tag)); 1170 av_push (av, tag_sv);
1100 av_push (av, sv); 1171 av_push (av, sv);
1101 1172
1102 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 1173 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
1103 ? cbor_tagged_stash 1174 ? cbor_tagged_stash
1104 : gv_stashpv ("CBOR::XS::Tagged" , 1); 1175 : gv_stashpv ("CBOR::XS::Tagged" , 1);
… …
1233 1304
1234 if (dec.err) 1305 if (dec.err)
1235 { 1306 {
1236 if (dec.shareable) 1307 if (dec.shareable)
1237 { 1308 {
1238 // need to break cyclic links, which whould all be in shareable 1309 // need to break cyclic links, which would all be in shareable
1239 int i; 1310 int i;
1240 SV **svp; 1311 SV **svp;
1241 1312
1242 for (i = av_len (dec.shareable) + 1; i--; ) 1313 for (i = av_len (dec.shareable) + 1; i--; )
1243 if ((svp = av_fetch (dec.shareable, i, 0))) 1314 if ((svp = av_fetch (dec.shareable, i, 0)))
1244 sv_setsv (*svp, &PL_sv_undef); 1315 sv_setsv (*svp, &PL_sv_undef);
1245 } 1316 }
1246 1317
1247 SvREFCNT_dec (sv); 1318 SvREFCNT_dec (sv);
1319
1320 if (dec.err_sv)
1321 sv_2mortal (dec.err_sv);
1322
1248 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);
1249 } 1324 }
1250 1325
1251 sv = sv_2mortal (sv); 1326 sv = sv_2mortal (sv);
1252 1327

Diff Legend

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