4xm: prevent NULL dereference with invalid huffman table

Signed-off-by: Janne Grunau <janne-libav@jannau.net>

4xm: prevent NULL dereference with invalid huffman table
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
1b1182ce · Laurent Aimar · Janne Grunau · 79964745 · 1b1182ce
Commit 1b1182ce authored Oct 02, 2011 by Laurent Aimar Committed by Janne Grunau Oct 10, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

4xm.c libavcodec/4xm.c +4 -3

No files found.
--- a/libavcodec/4xm.c
+++ b/libavcodec/4xm.c
@@ -602,9 +602,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;
 }