From a129622390fca8a298c3b121f42b2d15910b9b22 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 17 Jan 2012 03:17:56 +0100 Subject: [PATCH] lavc: Check CODEC_CAP_VARIABLE_FRAME_SIZE && !frame This combination is quite odd and almost certainly a bug if it happens. Reviewed-by: Justin Ruggles Signed-off-by: Michael Niedermayer --- libavcodec/utils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 22a7ee3666f..657eb5b932d 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -968,6 +968,8 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx, if (!user_packet) { if (avctx->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) { av_assert0(av_get_bits_per_sample(avctx->codec_id) != 0); + if (!frame) + return AVERROR(EINVAL); buf_size = nb_samples * avctx->channels * av_get_bits_per_sample(avctx->codec_id) / 8; } else { -- 2.39.2