From 9fb483fede7207c1f3965e5ae1ac0ee82e4d7a4e Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Sun, 31 May 2015 14:54:39 +0200 Subject: x264: Check memory allocation --- libavcodec/libx264.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libavcodec/libx264.c') diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 841b824c8a..d7d1df38db 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -542,6 +542,8 @@ static av_cold int X264_init(AVCodecContext *avctx) s = x264_encoder_headers(x4->enc, &nal, &nnal); avctx->extradata = p = av_malloc(s); + if (!p) + return AVERROR(ENOMEM); for (i = 0; i < nnal; i++) { /* Don't put the SEI in extradata. */ @@ -549,6 +551,8 @@ static av_cold int X264_init(AVCodecContext *avctx) av_log(avctx, AV_LOG_INFO, "%s\n", nal[i].p_payload+25); x4->sei_size = nal[i].i_payload; x4->sei = av_malloc(x4->sei_size); + if (!x4->sei) + return AVERROR(ENOMEM); memcpy(x4->sei, nal[i].p_payload, nal[i].i_payload); continue; } -- cgit v1.2.3