summaryrefslogtreecommitdiff
path: root/sharedbook.c
diff options
context:
space:
mode:
authorTim Terriberry <tterribe@xiph.org>2010-10-14 01:33:46 +0000
committerTim Terriberry <tterribe@xiph.org>2010-10-14 01:33:46 +0000
commitcffec5374b06db0e3052879234e1350dfaf8c246 (patch)
treee4f4dc9a39db8fcf39f5ab0039b869aed389652d /sharedbook.c
parent85749ea451123aedeb1ec3bfbbc15e9288917979 (diff)
downloadtremor-cffec5374b06db0e3052879234e1350dfaf8c246.tar.gz
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
Diffstat (limited to 'sharedbook.c')
-rw-r--r--sharedbook.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/sharedbook.c b/sharedbook.c
index 03c2147..188485e 100644
--- a/sharedbook.c
+++ b/sharedbook.c
@@ -294,15 +294,10 @@ ogg_int32_t *_book_unquantize(const static_codebook *b,int n,int *sparsemap,
return(NULL);
}
-void vorbis_staticbook_clear(static_codebook *b){
+void vorbis_staticbook_destroy(static_codebook *b){
if(b->quantlist)_ogg_free(b->quantlist);
if(b->lengthlist)_ogg_free(b->lengthlist);
memset(b,0,sizeof(*b));
-
-}
-
-void vorbis_staticbook_destroy(static_codebook *b){
- vorbis_staticbook_clear(b);
_ogg_free(b);
}