From patchwork Mon Jul 20 10:46:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 21201 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 775DF448A95 for ; Mon, 20 Jul 2020 13:46:43 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 532D868B9D5; Mon, 20 Jul 2020 13:46:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-40134.protonmail.ch (mail-40134.protonmail.ch [185.70.40.134]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1446868B9CF for ; Mon, 20 Jul 2020 13:46:37 +0300 (EEST) Date: Mon, 20 Jul 2020 10:46:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail; t=1595241996; bh=0li8g4GVvu2OyiPaRH7ETDyDv3cWJ5SFZAw6K3cSze0=; h=Date:To:From:Cc:Reply-To:Subject:From; b=BOmrLchiCpEv9IZFjQohmDGruwbuB4gldWGYSM7EdlIBXMWqjXjOWjyKdIbwC299r Ea7bTrzFOZAEvk5MsimPm0qB6/ApnHdnJeHkktp/aubQHunnTSTGAV7pHJ3ImNfP1y z13tcnr8FDgn2sc5gMWoLGh+OXKxbSrm64QRTnZQ= To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200720104609.556543-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=7.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mail.protonmail.ch Subject: [FFmpeg-devel] [PATCH] avcodec/apm: fix sample_rate check 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 Cc: Zane van Iperen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Zane van Iperen --- libavformat/apm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/apm.c b/libavformat/apm.c index 0d88e1099a..fe95a9ad7a 100644 --- a/libavformat/apm.c +++ b/libavformat/apm.c @@ -126,8 +126,8 @@ static int apm_read_header(AVFormatContext *s) if (avio_rl32(s->pb) != APM_FILE_EXTRADATA_SIZE) return AVERROR_INVALIDDATA; - /* I've never seen files greater than this. */ - if (par->sample_rate > 44100) + /* 8 = bits per sample * max channels */ + if (par->sample_rate > (INT_MAX / 8)) return AVERROR_INVALIDDATA; if (par->bits_per_coded_sample != 4)