From patchwork Thu Apr 4 23:08:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 12617 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 48791448D90 for ; Fri, 5 Apr 2019 02:11:16 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 29E9168990D; Fri, 5 Apr 2019 02:11:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe06-1.mx.upcmail.net (vie01a-dmta-pe06-1.mx.upcmail.net [84.116.36.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D820A687EE4 for ; Fri, 5 Apr 2019 02:11:09 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe06.mx.upcmail.net with esmtp (Exim 4.91) (envelope-from ) id 1hCBVl-00047H-2f for ffmpeg-devel@ffmpeg.org; Fri, 05 Apr 2019 01:11:09 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id CBUmhp9ZBxLwqCBUmhjwry; Fri, 05 Apr 2019 01:10:09 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.41.20 X-CNFS-Analysis: v=2.3 cv=WaxylHpX c=1 sm=1 tr=0 a=I1eytVlZLDX1BM2VTtTtSw==:117 a=I1eytVlZLDX1BM2VTtTtSw==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=nZOtpAppAAAA:20 a=-_9i-eTdipuMXZ40kBcA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=pHzHmUro8NiASowvMSCR:22 a=Ew2E2A-JSTLzCXPT_086:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 5 Apr 2019 01:08:47 +0200 Message-Id: <20190404230847.18897-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-CMAE-Envelope: MS4wfGsYKHR0gCB4sdle3khKlUrrscI4NfXCrnn7MDgv8bh1GsZtO7zBe2pcsBa6KT/4HvqvOmUD73qZiTzVYfw2bnvP/Rv0t0loQPhp5krP9z9+q8hYLlcJ NdJO2TlNb4H/RslHOMaxrI599M6eY4zARx1q/y53fEzF+Zuci0SfBCUm Subject: [FFmpeg-devel] [PATCH] avcodec/agm: Fix integer overflow with w/h 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" Fixes: negation of -2147483648 cannot be represented in type 'int'; cast to an unsigned type to negate this value to itself Fixes: 13999/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AGM_fuzzer-5644405991538688 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/agm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/agm.c b/libavcodec/agm.c index 2d2092222d..cbd45e8095 100644 --- a/libavcodec/agm.c +++ b/libavcodec/agm.c @@ -535,11 +535,13 @@ static int decode_frame(AVCodecContext *avctx, void *data, s->flags = 0; w = bytestream2_get_le32(gbyte); + h = bytestream2_get_le32(gbyte); + if (w == INT32_MIN || h == INT32_MIN) + return AVERROR_INVALIDDATA; if (w < 0) { w = -w; s->flags |= 2; } - h = bytestream2_get_le32(gbyte); if (h < 0) { h = -h; s->flags |= 1;