From cffec5374b06db0e3052879234e1350dfaf8c246 Mon Sep 17 00:00:00 2001 From: Tim Terriberry Date: Thu, 14 Oct 2010 01:33:46 +0000 Subject: Port r17029 and r17050 from libvorbis. Fix leak when aborting out of static_codebook unpack. Closes #1663. git-svn-id: https://svn.xiph.org/trunk/Tremor@17530 0101bb08-14d6-0310-b084-bc0e0c8e3800 --- info.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'info.c') diff --git a/info.c b/info.c index f743d62..3f3308e 100644 --- a/info.c +++ b/info.c @@ -233,8 +233,8 @@ static int _vorbis_unpack_books(vorbis_info *vi,oggpack_buffer *opb){ ci->books=oggpack_read(opb,8)+1; if(ci->books<=0)goto err_out; for(i=0;ibooks;i++){ - ci->book_param[i]=(static_codebook *)_ogg_calloc(1,sizeof(*ci->book_param[i])); - if(vorbis_staticbook_unpack(opb,ci->book_param[i]))goto err_out; + ci->book_param[i]=vorbis_staticbook_unpack(opb); + if(!ci->book_param[i])goto err_out; } /* time backend settings */ -- cgit v1.2.1