RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/vlc: merge lost 16bit end of array check 

Also cleanup related code

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2023-10-22 20:04:04 +02:00
parent a23d527ec5
commit 9b546a0717
No known key found for this signature in database
GPG Key ID: B18E8928B3948D64
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/vlc.c
View File

@ -358,8 +358,8 @@ static void add_level(VLC_MULTI_ELEM *table, const int nb_elems,
const int minlen, const int max, const int minlen, const int max,
unsigned* levelcnt, VLC_MULTI_ELEM *info) unsigned* levelcnt, VLC_MULTI_ELEM *info)
{ {
if (nb_elems > 256 && curlevel > 2) int is16bit = nb_elems>256;
return; // No room int max_symbols = VLC_MULTI_MAX_SYMBOLS >> is16bit;
for (int i = num-1; i > max; i--) { for (int i = num-1; i > max; i--) {
for (int j = 0; j < 2; j++) { for (int j = 0; j < 2; j++) {
int newlimit, sym; int newlimit, sym;
@ -373,7 +373,7 @@ static void add_level(VLC_MULTI_ELEM *table, const int nb_elems,
code = curcode + (buf[t].code >> curlen); code = curcode + (buf[t].code >> curlen);
newlimit = curlimit - l; newlimit = curlimit - l;
l += curlen; l += curlen;
if (nb_elems>256) AV_WN16(info->val+2*curlevel, sym); if (is16bit) AV_WN16(info->val+2*curlevel, sym);
else info->val[curlevel] = sym&0xFF; else info->val[curlevel] = sym&0xFF;
if (curlevel) { // let's not add single entries if (curlevel) { // let's not add single entries
@ -386,7 +386,7 @@ static void add_level(VLC_MULTI_ELEM *table, const int nb_elems,
levelcnt[curlevel-1]++; levelcnt[curlevel-1]++;
} }
if (curlevel+1 < VLC_MULTI_MAX_SYMBOLS && newlimit >= minlen) { if (curlevel+1 < max_symbols && newlimit >= minlen) {
add_level(table, nb_elems, num, numbits, buf, add_level(table, nb_elems, num, numbits, buf,
code, l, newlimit, curlevel+1, code, l, newlimit, curlevel+1,
minlen, max, levelcnt, info); minlen, max, levelcnt, info);