From 0bfa899544d31ee2f34d149eb8bc17f89d7e9715 Mon Sep 17 00:00:00 2001 From: Nils Wallménius Date: Tue, 7 Dec 2010 16:22:51 +0000 Subject: libtremor: merge upstream revision 17522 and 17523 adding more sanity checking. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28760 a1c6a512-1295-4272-9138-f99709370657 --- apps/codecs/libtremor/res012.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'apps/codecs/libtremor/res012.c') diff --git a/apps/codecs/libtremor/res012.c b/apps/codecs/libtremor/res012.c index a60cf7fa1e..bcddf97640 100644 --- a/apps/codecs/libtremor/res012.c +++ b/apps/codecs/libtremor/res012.c @@ -109,8 +109,10 @@ static vorbis_info_residue *res0_unpack(vorbis_info *vi,oggpack_buffer *opb){ info->booklist[j]=oggpack_read(opb,8); if(info->groupbook>=ci->books)goto errout; - for(j=0;jbooklist[j]>=ci->books)goto errout; + if(ci->book_param[info->booklist[j]]->maptype==0)goto errout; + } /* verify the phrasebook is not specifying an impossible or inconsistent partitioning scheme. */ -- cgit v1.2.3