generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-03-19 13:02:13 +01:00
Code Issues Projects Releases Wiki Activity

fixed segv on cyclic reference(patch by dankogai)

Browse Source
This commit is contained in:
tokuhirom 2010-08-21 16:02:23 +09:00
parent c8e351b31e
commit a91c1ec6d9
2 changed files with 42 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
perl/pack.c
View File

@ -49,6 +49,8 @@ static void need(enc_t *enc, STRLEN len);
# error "msgpack only supports IVSIZE = 8,4,2 environment." # error "msgpack only supports IVSIZE = 8,4,2 environment."
#endif #endif
#define ERR_NESTING_EXCEEDED "perl structure exceeds maximum nesting level (max_depth set too low?)"
static void need(enc_t *enc, STRLEN len) static void need(enc_t *enc, STRLEN len)
{ {
@ -146,9 +148,10 @@ static int try_int(enc_t* enc, const char *p, size_t len) {
} }
static void _msgpack_pack_rv(enc_t *enc, SV* sv); static void _msgpack_pack_rv(enc_t *enc, SV* sv, int depth);
static void _msgpack_pack_sv(enc_t *enc, SV* sv) { static void _msgpack_pack_sv(enc_t *enc, SV* sv, int depth) {
if (!depth) Perl_croak(aTHX_ ERR_NESTING_EXCEEDED);
SvGETMAGIC(sv); SvGETMAGIC(sv);
if (sv==NULL) { if (sv==NULL) {
@ -171,7 +174,7 @@ static void _msgpack_pack_sv(enc_t *enc, SV* sv) {
} else if (SvIOKp(sv)) { } else if (SvIOKp(sv)) {
PACK_IV(enc, SvIV(sv)); PACK_IV(enc, SvIV(sv));
} else if (SvROK(sv)) { } else if (SvROK(sv)) {
_msgpack_pack_rv(enc, SvRV(sv)); _msgpack_pack_rv(enc, SvRV(sv), depth-1);
} else if (!SvOK(sv)) { } else if (!SvOK(sv)) {
msgpack_pack_nil(enc); msgpack_pack_nil(enc);
} else if (isGV(sv)) { } else if (isGV(sv)) {
@ -182,8 +185,9 @@ static void _msgpack_pack_sv(enc_t *enc, SV* sv) {
} }
} }
static void _msgpack_pack_rv(enc_t *enc, SV* sv) { static void _msgpack_pack_rv(enc_t *enc, SV* sv, int depth) {
svtype svt; svtype svt;
if (!depth) Perl_croak(aTHX_ ERR_NESTING_EXCEEDED);
SvGETMAGIC(sv); SvGETMAGIC(sv);
svt = SvTYPE(sv); svt = SvTYPE(sv);
@ -207,8 +211,8 @@ static void _msgpack_pack_rv(enc_t *enc, SV* sv) {
msgpack_pack_map(enc, count); msgpack_pack_map(enc, count);
while (he = hv_iternext(hval)) { while (he = hv_iternext(hval)) {
_msgpack_pack_sv(enc, hv_iterkeysv(he)); _msgpack_pack_sv(enc, hv_iterkeysv(he), depth);
_msgpack_pack_sv(enc, HeVAL(he)); _msgpack_pack_sv(enc, HeVAL(he), depth);
} }
} else if (svt == SVt_PVAV) { } else if (svt == SVt_PVAV) {
AV* ary = (AV*)sv; AV* ary = (AV*)sv;
@ -218,7 +222,7 @@ static void _msgpack_pack_rv(enc_t *enc, SV* sv) {
for (i=0; i<len; i++) { for (i=0; i<len; i++) {
SV** svp = av_fetch(ary, i, 0); SV** svp = av_fetch(ary, i, 0);
if (svp) { if (svp) {
_msgpack_pack_sv(enc, *svp); _msgpack_pack_sv(enc, *svp, depth);
} else { } else {
msgpack_pack_nil(enc); msgpack_pack_nil(enc);
} }
@ -244,11 +248,13 @@ static void _msgpack_pack_rv(enc_t *enc, SV* sv) {
XS(xs_pack) { XS(xs_pack) {
dXSARGS; dXSARGS;
if (items != 2) { if (items < 2) {
Perl_croak(aTHX_ "Usage: Data::MessagePack->pack($dat)"); Perl_croak(aTHX_ "Usage: Data::MessagePack->pack($dat [,$max_depth])");
} }
SV* val = ST(1); SV* val = ST(1);
int depth = 512;
if (items >= 3) depth = SvIV(ST(2));
enc_t enc; enc_t enc;
enc.sv = sv_2mortal(NEWSV(0, INIT_SIZE)); enc.sv = sv_2mortal(NEWSV(0, INIT_SIZE));
@ -256,7 +262,7 @@ XS(xs_pack) {
enc.end = SvEND(enc.sv); enc.end = SvEND(enc.sv);
SvPOK_only(enc.sv); SvPOK_only(enc.sv);
_msgpack_pack_sv(&enc, val); _msgpack_pack_sv(&enc, val, depth);
SvCUR_set(enc.sv, enc.cur - SvPVX (enc.sv)); SvCUR_set(enc.sv, enc.cur - SvPVX (enc.sv));
*SvEND (enc.sv) = 0; /* many xs functions expect a trailing 0 for text strings */ *SvEND (enc.sv) = 0; /* many xs functions expect a trailing 0 for text strings */

25
perl/t/08_cycle.t Normal file
View File

@ -0,0 +1,25 @@
use t::Util;
use Test::More;
use Data::MessagePack;
plan tests => 5;
my $aref = [0];
$aref->[1] = $aref;
eval { Data::MessagePack->pack($aref) };
ok $@, $@;
my $href = {};
$href->{cycle} = $href;
eval { Data::MessagePack->pack($aref) };
ok $@, $@;
$aref = [0,[1,2]];
eval { Data::MessagePack->pack($aref) };
ok !$@;
eval { Data::MessagePack->pack($aref, 3) };
ok !$@;
eval { Data::MessagePack->pack($aref, 2) };
ok $@, $@;