summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorNils Wallménius <nils@rockbox.org>2010-12-06 16:34:21 +0000
committerNils Wallménius <nils@rockbox.org>2010-12-06 16:34:21 +0000
commit4487107d25b6bd5f9d197439159a6c95d696fff7 (patch)
tree866c7c3b7a97567afda3ffd15578ea3e56b7b23b /apps
parent67efbc13870ee87ce3df442f7c396c13481921ec (diff)
downloadrockbox-4487107d25b6bd5f9d197439159a6c95d696fff7.tar.gz
rockbox-4487107d25b6bd5f9d197439159a6c95d696fff7.tar.bz2
rockbox-4487107d25b6bd5f9d197439159a6c95d696fff7.zip
libtremor: merge upstream revision 17510.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28744 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/codecs/libtremor/sharedbook.c15
1 files changed, 14 insertions, 1 deletions
diff --git a/apps/codecs/libtremor/sharedbook.c b/apps/codecs/libtremor/sharedbook.c
index 9519976c95..884920ecda 100644
--- a/apps/codecs/libtremor/sharedbook.c
+++ b/apps/codecs/libtremor/sharedbook.c
@@ -122,7 +122,20 @@ static ogg_uint32_t *_make_words(long *l,long n,long sparsecount){
}else
if(sparsecount==0)count++;
}
-
+
+ /* sanity check the huffman tree; an underpopulated tree must be
+ rejected. The only exception is the one-node pseudo-nil tree,
+ which appears to be underpopulated because the tree doesn't
+ really exist; there's only one possible 'codeword' or zero bits,
+ but the above tree-gen code doesn't mark that. */
+ if(sparsecount != 1){
+ for(i=1;i<33;i++)
+ if(marker[i] & (0xffffffffUL>>(32-i))){
+ _ogg_free(r);
+ return(NULL);
+ }
+ }
+
/* bitreverse the words because our bitwise packer/unpacker is LSb
endian */
for(i=0,count=0;i<n;i++){