diff options
| author | Laurent Aimar <fenrir@videolan.org> | 2011-10-02 00:38:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-02 05:45:01 +0200 |
| commit | 535112b3658c21d1f9c4d2b44689342a32ff6eea (patch) | |
| tree | c74b9165bd6ccc4bcbdbef750016c8b0c65ca15e | |
| parent | 2e342df4a266f903084a5f705c7f2932e79067de (diff) | |
| download | ffmpeg-535112b3658c21d1f9c4d2b44689342a32ff6eea.tar.gz | |
Prevent NULL dereference when the huffman table is invalid in the 4xm decoder.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4a8ff0636d67c6df059f2ae2df49ad1181de14ca)
| -rw-r--r-- | libavcodec/4xm.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index d89b494b09..1ec64ae3e0 100644 --- a/libavcodec/4xm.c +++ b/libavcodec/4xm.c @@ -601,9 +601,10 @@ static const uint8_t *read_huffman_tables(FourXContext *f, const uint8_t * const len_tab[j]= len; } - init_vlc(&f->pre_vlc, ACDC_VLC_BITS, 257, - len_tab , 1, 1, - bits_tab, 4, 4, 0); + if (init_vlc(&f->pre_vlc, ACDC_VLC_BITS, 257, + len_tab , 1, 1, + bits_tab, 4, 4, 0)) + return NULL; return ptr; } |