From f1ca17f6a1a8a04016ceb31e799cc0504729322b Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 14 Jan 2014 23:16:07 +0100 Subject: decoder/ffmpeg: check for av_samples_get_buffer_size() errors Fixes potential nullptr dereference. --- src/decoder/FfmpegDecoderPlugin.cxx | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/decoder') diff --git a/src/decoder/FfmpegDecoderPlugin.cxx b/src/decoder/FfmpegDecoderPlugin.cxx index 705a97abf..7b827da27 100644 --- a/src/decoder/FfmpegDecoderPlugin.cxx +++ b/src/decoder/FfmpegDecoderPlugin.cxx @@ -222,6 +222,9 @@ copy_interleave_frame(const AVCodecContext *codec_context, codec_context->channels, frame->nb_samples, codec_context->sample_fmt, 1); + if (data_size <= 0) + return data_size; + if (av_sample_fmt_is_planar(codec_context->sample_fmt) && codec_context->channels > 1) { if(*global_buffer_size < data_size) { -- cgit v1.2.3