From patchwork Fri Jan 11 22:46:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 11713 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 3C07444C431 for ; Sat, 12 Jan 2019 00:47:19 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 587B868A353; Sat, 12 Jan 2019 00:47:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe06-2.mx.upcmail.net (vie01a-dmta-pe06-2.mx.upcmail.net [84.116.36.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2DA6868A274 for ; Sat, 12 Jan 2019 00:47:01 +0200 (EET) 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.88) (envelope-from ) id 1gi5a5-0008NH-0M for ffmpeg-devel@ffmpeg.org; Fri, 11 Jan 2019 23:47:13 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id i5Z7gsF7r2WSsi5Z7g3upC; Fri, 11 Jan 2019 23:46:13 +0100 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=E7kcWpVl 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=luFtQbhcHJManTUkjpAA:9 a=pHzHmUro8NiASowvMSCR:22 a=nt3jZW36AmriUCFCBwmW:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 11 Jan 2019 23:46:11 +0100 Message-Id: <20190111224611.6725-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-CMAE-Envelope: MS4wfNXCfxFkrLXE45sJp6GmSuwX2W5qvQu6iPpL9zxJdTKUboiOesMpOtLFRDLjFaiCtbUU++YXHTPz6bSuTicz3sA5RsD0VMtbhtwrArxcPhk2C7kaTAdX Va6zNj3Nj6thB3y8WkclZ2InWHa9a4z8Wy8AuVl7fnFyJb3Ulpn8gPPX Subject: [FFmpeg-devel] [PATCH] avcodec/lzw: Check for end of input 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: Timeout Fixes: 11873/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-5093495044308992 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/lzw.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/lzw.c b/libavcodec/lzw.c index b0b9a34358..e26e4829ee 100644 --- a/libavcodec/lzw.c +++ b/libavcodec/lzw.c @@ -71,6 +71,9 @@ static int lzw_get_code(struct LZWState * s) { int c; + if (s->bbits < s->cursize && bytestream2_get_bytes_left(&s->gb) <= 0) + return s->end_code; + if(s->mode == FF_LZW_GIF) { while (s->bbits < s->cursize) { if (!s->bs) {