RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-21 06:16:59 +00:00
Code Issues Projects Releases Wiki Activity

vorbis: Reorder conditions to avoid possible overread

Browse Source 
This can trigger a single-byte overread if the codebook has the maximum
number of entries.

Fixes #6743.
This commit is contained in:
Mark Thompson 2017-10-17 22:25:46 +01:00
parent 242d8c8763
commit c37de51920
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/vorbis.c
View File

@ -58,7 +58,7 @@ int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num)
uint32_t exit_at_level[33] = { 404 };
unsigned i, j, p, code;
for (p = 0; (bits[p] == 0) && (p < num); ++p)
for (p = 0; (p < num) && (bits[p] == 0); ++p)
;
if (p == num)
return 0;
@ -71,7 +71,7 @@ int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num)
++p;
for (i = p; (bits[i] == 0) && (i < num); ++i)
for (i = p; (i < num) && (bits[i] == 0); ++i)
;
if (i == num)
return 0;