From patchwork Tue Apr 2 18:27:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 12593 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 C312C44766A for ; Tue, 2 Apr 2019 21:29:39 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A369368AD2C; Tue, 2 Apr 2019 21:29:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe08-1.mx.upcmail.net (vie01a-dmta-pe08-1.mx.upcmail.net [84.116.36.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0999D68AC54 for ; Tue, 2 Apr 2019 21:29:33 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe08.mx.upcmail.net with esmtp (Exim 4.91) (envelope-from ) id 1hBOA8-00072z-28 for ffmpeg-devel@ffmpeg.org; Tue, 02 Apr 2019 20:29:32 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id BO99hCy4pxLwqBO99hzuKO; Tue, 02 Apr 2019 20:28:32 +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=dGxVMAyIEL2ge4s0EvUA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=pHzHmUro8NiASowvMSCR:22 a=Ew2E2A-JSTLzCXPT_086:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 2 Apr 2019 20:27:13 +0200 Message-Id: <20190402182713.10524-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-CMAE-Envelope: MS4wfHA1bNxC6JgSFHQnyEAMut3D0l2C3BiaQRT9gWJagj69W8My259DYZhDlt5pNBmYSnCgm0imk4eSjx7BJUJctCMpNtrtVL0pYgRio6vxy/U4E8iliziY Ce9jwDZGxKkhUehJ6LQST2Skw77GuM54M6IX8rI9+C3DHJtlKCEbp9fg Subject: [FFmpeg-devel] [PATCH] avcodec/agm: Check that there is available input in read_code() before reading it 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: out of array access Fixes: 13997/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AGM_fuzzer-5701427252428800 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/agm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/agm.c b/libavcodec/agm.c index b0e8b80f81..8e4d6eb342 100644 --- a/libavcodec/agm.c +++ b/libavcodec/agm.c @@ -88,6 +88,9 @@ static int read_code(GetBitContext *gb, int *oskip, int *level, int *map, int mo { int len = 0, skip = 0, max; + if (get_bits_left(gb) < 2) + return AVERROR_INVALIDDATA; + if (show_bits(gb, 2)) { switch (show_bits(gb, 4)) { case 1: