Avoid a null pointer dereference on oom when decoding smacker.

Fixes ticket #2728.

Avoid a null pointer dereference on oom when decoding smacker.
Fixes ticket #2728.
90bd75e6 · Carl Eugen Hoyos · a1dbe49d · 90bd75e6
Commit 90bd75e6 authored Jun 29, 2013 by Carl Eugen Hoyos
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

smacker.c libavcodec/smacker.c +2 -0

No files found.
--- a/libavcodec/smacker.c
+++ b/libavcodec/smacker.c
@@ -261,6 +261,8 @@ static int smacker_decode_header_tree(SmackVContext *smk, GetBitContext *gb, int
    huff.maxlength = 0;
    huff.current = 0;
    huff.values = av_mallocz(huff.length * sizeof(int));
+    if (!huff.values)
+        return AVERROR(ENOMEM);

    if (smacker_decode_bigtree(gb, &huff, &ctx) < 0)
        err = -1;