diff options
author | Tim Terriberry <tterribe@xiph.org> | 2010-10-14 00:07:49 +0000 |
---|---|---|
committer | Tim Terriberry <tterribe@xiph.org> | 2010-10-14 00:07:49 +0000 |
commit | 699d1778f89e1bec3903805c7e0430cd6d484ab5 (patch) | |
tree | f3bfd6e33d9527d0d6c962b19166353187c1ce67 | |
parent | d59c364ab099ae10af134e270659a8644c0622b6 (diff) | |
download | tremor-699d1778f89e1bec3903805c7e0430cd6d484ab5.tar.gz |
Port of r16181 from libvorbis.
First half of fix for https://bugzilla.mozilla.org/show_bug.cgi?id=500254
Residue code was not checking that its partition books were books with
specified/populated value mappings.
git-svn-id: https://svn.xiph.org/trunk/Tremor@17522 0101bb08-14d6-0310-b084-bc0e0c8e3800
-rw-r--r-- | res012.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -110,8 +110,10 @@ 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;j<acc;j++) + for(j=0;j<acc;j++){ if(info->booklist[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. */ |