From patchwork Sun Oct 16 20:41: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: 1026 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.133 with SMTP id o127csp93883vsd; Sun, 16 Oct 2016 13:41:43 -0700 (PDT) X-Received: by 10.28.12.9 with SMTP id 9mr6310306wmm.132.1476650503279; Sun, 16 Oct 2016 13:41:43 -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 qa7si36493994wjc.52.2016.10.16.13.41.42; Sun, 16 Oct 2016 13:41:43 -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 2625668980D; Sun, 16 Oct 2016 23:41:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f66.google.com (mail-lf0-f66.google.com [209.85.215.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CA11D687EB9 for ; Sun, 16 Oct 2016 23:41:31 +0300 (EEST) Received: by mail-lf0-f66.google.com with SMTP id l131so20212009lfl.0 for ; Sun, 16 Oct 2016 13:41:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=gs2u1jC6Fegjh0bOcsQstQOTu947RoKf6MUqdQodj5o=; b=LiOfZ9bk/hJKpfWrG3Lc0OgQ7f/TXn0TrYF3Gn/0Tp/nPldfiJD0Fo9eSCf3WzPFcn QouLuyqK4J4kN03PP88Xn+A8StdV28L+ABSGu5t/WYx/l79rVwrcA55Ypquzv3y2BNCs 7lp2ECH2JFMMA3/2dY1Wm9J09XlJnnP46wwX4ElZ4hVa8gt0Zwu3vW42s5OfiMWkmPAf pfDa50JUtzwXrxmhsMGDVmqa/I+q6cufbG1DpNXTPDpXucIIFwbIKuMMIKDayPI1qJYr LrX0yuVEPaM+RwKn79UBgZm/8IiP8qOZq+Z4SvGknmNvv9BRGZhNiWtIfyOUmw9P45K1 48xQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=gs2u1jC6Fegjh0bOcsQstQOTu947RoKf6MUqdQodj5o=; b=nKRhDBtvkte1b9ry/nEGRpM0jhaCak+ABRUt5y5n2FnKO/J67K788saUnEV4J1fTHJ 63Mua+zR3O2Xe02QnLHa/XCZ8LL42t39zJBmvmvaddb0dm0Miv1dxtR5kiTdEhzbaERU DHIVtjWzKrGhNYyKVQWcLzOhiTm8cUHozLj6+DtdCcqCYxM6fCLHPhX6uql/2bQYlfVl ESDoFXMvdHyu5XTY6SYaPu3mi7xeRwkCZt0L3O6dm7Cwyx9wRYrOqiee2BrtAsct5XBb LargRBk8Y9RuAs5vzkUdEDJHJtSaHza+dwd6wR5iXDf/SOC8nVSm9abBKc2avoju2jY5 a5ZA== X-Gm-Message-State: AA6/9RntnxEg9y52xRUjhAa58oZjKSSUFY6eYQaqPvbYDGPv4GCIEAHACFPgWcTuXWUvJg== X-Received: by 10.28.165.78 with SMTP id o75mr5750581wme.59.1476650493050; Sun, 16 Oct 2016 13:41:33 -0700 (PDT) Received: from [192.168.2.21] (p5B0720DA.dip0.t-ipconnect.de. [91.7.32.218]) by smtp.googlemail.com with ESMTPSA id vx1sm12600079wjc.3.2016.10.16.13.41.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 16 Oct 2016 13:41:32 -0700 (PDT) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches Message-ID: Date: Sun, 16 Oct 2016 22:41:32 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] astdec: fix division by zero 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" Signed-off-by: Andreas Cadhalpun --- libavformat/astdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/astdec.c b/libavformat/astdec.c index f3ca721..7a53d0b 100644 --- a/libavformat/astdec.c +++ b/libavformat/astdec.c @@ -90,7 +90,7 @@ static int ast_read_packet(AVFormatContext *s, AVPacket *pkt) pos = avio_tell(s->pb); type = avio_rl32(s->pb); size = avio_rb32(s->pb); - if (size > INT_MAX / s->streams[0]->codecpar->channels) + if (!s->streams[0]->codecpar->channels || size > INT_MAX / s->streams[0]->codecpar->channels) return AVERROR_INVALIDDATA; size *= s->streams[0]->codecpar->channels;