highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent NULL dereference when the huffman table is invalid in the 4xm decoder.

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4a8ff0636d67c6df059f2ae2df49ad1181de14ca)
This commit is contained in:
Laurent Aimar 2011-10-02 00:38:28 +02:00 committed by Michael Niedermayer
parent 2e342df4a2
commit 535112b365
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/4xm.c
View File

@ -601,9 +601,10 @@ static const uint8_t *read_huffman_tables(FourXContext *f, const uint8_t * const
len_tab[j]= len; len_tab[j]= len;
} }
init_vlc(&f->pre_vlc, ACDC_VLC_BITS, 257, if (init_vlc(&f->pre_vlc, ACDC_VLC_BITS, 257,
len_tab , 1, 1, len_tab , 1, 1,
bits_tab, 4, 4, 0); bits_tab, 4, 4, 0))
return NULL;
return ptr; return ptr;
} }