aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-05-15 22:02:12 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-05-15 23:55:29 +0200
commit2612b69d3f707540a8e517088c6dc520325ef42c (patch)
treee5eabb7675e967a6840bc223b631e8dbeb3909f6
parent88217c40b667a09512d0f046c1e473548169b376 (diff)
downloadffmpeg-2612b69d3f707540a8e517088c6dc520325ef42c.tar.gz
avcodec/libtheoraenc: Check for av_malloc failure
Fixes CID1257799 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit c64b2d480b4a35d4face9928b4265a0fda3f3dd9) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/libtheoraenc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/libtheoraenc.c b/libavcodec/libtheoraenc.c
index b4b395aa8c..0ccb9ecc11 100644
--- a/libavcodec/libtheoraenc.c
+++ b/libavcodec/libtheoraenc.c
@@ -111,6 +111,8 @@ static int get_stats(AVCodecContext *avctx, int eos)
// libtheora generates a summary header at the end
memcpy(h->stats, buf, bytes);
avctx->stats_out = av_malloc(b64_size);
+ if (!avctx->stats_out)
+ return AVERROR(ENOMEM);
av_base64_encode(avctx->stats_out, b64_size, h->stats, h->stats_offset);
}
return 0;