From patchwork Sun Oct 23 16:31:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1150 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.133 with SMTP id o127csp1838364vsd; Sun, 23 Oct 2016 09:31:23 -0700 (PDT) X-Received: by 10.28.132.202 with SMTP id g193mr12390507wmd.117.1477240283467; Sun, 23 Oct 2016 09:31:23 -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 to4si12085767wjb.200.2016.10.23.09.31.23; Sun, 23 Oct 2016 09:31:23 -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 3B97C689D07; Sun, 23 Oct 2016 19:31:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 87589689CE7 for ; Sun, 23 Oct 2016 19:31:11 +0300 (EEST) Received: by mail-wm0-f66.google.com with SMTP id d199so6305175wmd.1 for ; Sun, 23 Oct 2016 09:31:14 -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=snRjAaMycJd1+Csb4jfFQzxJ/AIIm0A4odl5cDHYgUw=; b=r8ENg3M32zjx/BJiXYYxWFaYRy4Ss3WGc3sMdTP+bj3Rta+MaPYHxc4vLE6n0ywXzw upHwq/by4W3pZSG/RgMxF8b9zW5fE1+r/1L0MWRkrVaWspRKy57brEoFLpVxut1M2Qmd b//4kP/PwE7EWGEF/3h8vH6Fis+0ihx2I81XTku5mT8W+jb+D1tLXJIswN/tpVs/Zzf9 46a3tp5/xDWDL8a/27f9ZN4IXP68RTH28uT6bRms1S3e2e4r86IQ+uTa94TzB4TkIyz/ wWV8fusOCVIAj126Zgqjk9PEF6F+PUuWePaXu2x/p2+EyhezgWeASZFtLqXSWbStDb47 Nbeg== 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=snRjAaMycJd1+Csb4jfFQzxJ/AIIm0A4odl5cDHYgUw=; b=MaaTM3QZMVKtxbOWk5t0Uk+mQL9uQnoWAfguJRhZ+FrexF5hYUIHSCwhQRpSs3pll2 nNfh4uKeDuhPFKCSQqWudC8GpY0L9c2rRxMeFxS2V5Thy4Ynd/WR8qNkF6beZuSjkj3o JzRjlBOl6u/XUXKFap1bffZ6xWmD5B2+w1MkKHVZZpW+zUvsPtC2CMC8ZIln+bs9l7Fc VVCN47ZKLTI5H8vw8oXwXYms9ZrRFjPjRbnU/yhFXzrq/p4mBAOL2yl1D0C3Aw+PkDgH NdcWYfVYjZZuELzF9NfcLkGpwzK5XA+3L626qahnNoGIracTmCDkwOKBdR8GQVgLAuw5 +EAQ== X-Gm-Message-State: AA6/9RleeiPDu8alniHOdqxjZ1cfZ76/1SpaC/wZl2WVVrUtrhFjS7i/fAlOYIdcmXIPHA== X-Received: by 10.28.66.68 with SMTP id p65mr10910787wma.126.1477240274282; Sun, 23 Oct 2016 09:31:14 -0700 (PDT) Received: from [192.168.2.21] (p5B095E5A.dip0.t-ipconnect.de. [91.9.94.90]) by smtp.googlemail.com with ESMTPSA id n72sm10017324wmd.11.2016.10.23.09.31.13 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Oct 2016 09:31:13 -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: <6b1d8f8a-d115-39a2-ba2b-9d0886dba162@googlemail.com> Date: Sun, 23 Oct 2016 18:31:13 +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 11/12] voc_packet: 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/voc_packet.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/voc_packet.c b/libavformat/voc_packet.c index 5833a79..0d56436 100644 --- a/libavformat/voc_packet.c +++ b/libavformat/voc_packet.c @@ -106,6 +106,11 @@ ff_voc_get_packet(AVFormatContext *s, AVPacket *pkt, AVStream *st, int max_size) } } + if (par->sample_rate <= 0) { + av_log(s, AV_LOG_ERROR, "Invalid sample rate %d\n", par->sample_rate); + return AVERROR_INVALIDDATA; + } + if (tmp_codec >= 0) { tmp_codec = ff_codec_get_id(ff_voc_codec_tags, tmp_codec); if (par->codec_id == AV_CODEC_ID_NONE)