From 90bd75e6eb789d196fef0135a58bcfe7904c65c5 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sat, 29 Jun 2013 16:04:07 +0200 Subject: [PATCH] Avoid a null pointer dereference on oom when decoding smacker. Fixes ticket #2728. --- libavcodec/smacker.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c index d0a10bfdc8..0af11a93b6 100644 --- 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;