From patchwork Sun Oct 23 16:27:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1141 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.133 with SMTP id o127csp1837304vsd; Sun, 23 Oct 2016 09:27:43 -0700 (PDT) X-Received: by 10.194.18.137 with SMTP id w9mr9606862wjd.198.1477240062959; Sun, 23 Oct 2016 09:27:42 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ev6si12105719wjd.116.2016.10.23.09.27.42; Sun, 23 Oct 2016 09:27:42 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C27D8689CB7; Sun, 23 Oct 2016 19:27:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B452D689C61 for ; Sun, 23 Oct 2016 19:27:30 +0300 (EEST) Received: by mail-wm0-f68.google.com with SMTP id d199so6295669wmd.1 for ; Sun, 23 Oct 2016 09:27:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:subject:to:references:message-id:date:user-agent:mime-version :in-reply-to:content-transfer-encoding; bh=aeZNDon+5hnon72fF+vfai4M6yjWlbObBM0D0lGxreI=; b=rTpH1IJspbN16EqU25WtWt6tfuNpM6OnHHph/KbtJ5MRVi6/cBizASMQ8ZAX8D+eN9 cvgM1uxHZWJwiEyNWRk2F+sQEg00a8YarBt4QundkPYD7lxww6tTLWYqvgFFSdCG9LTM sVB5JImo8A11Zk3e4o12CyFVTu6mFLjptH2bFA8lVmULoGNsexpkGjzBpWe0pv63pcXJ rrcEfd7cbvZpAYjUAuCxN/BnKIDWcUV6ZHqDRXQ4iAE5jEbh78EzmTNnYtDAj+cjIgLT /OqyhbpU31O8vxjdnuvhgKO5tuVRkZ/PDNGE/GgxDn19uVJSMZEjsRH8iuJ/lYBB7dj6 NiBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:subject:to:references:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=aeZNDon+5hnon72fF+vfai4M6yjWlbObBM0D0lGxreI=; b=FosMdKLWoCd26r9ao5xO9PosEaM57H1vEN+wuZDdDNgM4ug0qsfJ9+dDyLV8h5AuLZ pPfRjPzta3o43WQgJ8FGAQP9ofyisFh5h1QqLPPI8MMmhGYQZSZpYzvT/66drULuu5wr CIJcr7iNkfU7Xl4JvUlb2JdrD0o6shlgz4zwiGcCty7bk2DVx3EzPrNNioXA4hQo35q3 gdNQDo+p4YxxZjCBskkonXjCsgGSE/temsvns2Lz5uKVdTKv1FI7QEiIQphwuU4Ie0Dy sfOIbY+ANmMhXnF284Avu6k1HxgcmB6vwxQlF4NMn6xvVcxLuQbE2c02EuoduUVjc/ZP ud3g== X-Gm-Message-State: AA6/9Rm1e5CTeZjeGr+iHSaGGAh/3+4Ps/KjD/jywHJh5qDiDfjaEPS+gX2qNU9DNjMj8w== X-Received: by 10.28.228.5 with SMTP id b5mr10792162wmh.101.1477240053489; Sun, 23 Oct 2016 09:27:33 -0700 (PDT) Received: from [192.168.2.21] (p5B095E5A.dip0.t-ipconnect.de. [91.9.94.90]) by smtp.googlemail.com with ESMTPSA id p184sm10026685wmg.3.2016.10.23.09.27.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Oct 2016 09:27:33 -0700 (PDT) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches References: <6622a3c7-3900-8982-1179-4ccdd0fec2b3@googlemail.com> Message-ID: <756e59f0-3689-8660-00c4-ca6b623d4992@googlemail.com> Date: Sun, 23 Oct 2016 18:27:32 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 In-Reply-To: <6622a3c7-3900-8982-1179-4ccdd0fec2b3@googlemail.com> Subject: [FFmpeg-devel] [PATCH 03/12] ffmdec: validate sample_rate X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" A negative sample rate doesn't make sense and triggers assertions in av_rescale_rnd. Signed-off-by: Andreas Cadhalpun --- libavformat/ffmdec.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c index 16ba8ec..6b09be2 100644 --- a/libavformat/ffmdec.c +++ b/libavformat/ffmdec.c @@ -432,6 +432,11 @@ static int ffm2_read_header(AVFormatContext *s) goto fail; } codec->sample_rate = avio_rb32(pb); + if (codec->sample_rate <= 0) { + av_log(s, AV_LOG_ERROR, "Invalid sample rate %d\n", codec->sample_rate); + ret = AVERROR_INVALIDDATA; + goto fail; + } codec->channels = avio_rl16(pb); codec->frame_size = avio_rl16(pb); break; @@ -628,6 +633,10 @@ static int ffm_read_header(AVFormatContext *s) break; case AVMEDIA_TYPE_AUDIO: codec->sample_rate = avio_rb32(pb); + if (codec->sample_rate <= 0) { + av_log(s, AV_LOG_ERROR, "Invalid sample rate %d\n", codec->sample_rate); + goto fail; + } codec->channels = avio_rl16(pb); codec->frame_size = avio_rl16(pb); break;