From patchwork Tue Apr 16 14:48:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 12768 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 B1C5444903C for ; Tue, 16 Apr 2019 17:51:16 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9470A68A43E; Tue, 16 Apr 2019 17:51: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 C855D68A1FD for ; Tue, 16 Apr 2019 17:51:10 +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 1hGPQU-0005XE-0x for ffmpeg-devel@ffmpeg.org; Tue, 16 Apr 2019 16:51:10 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id GPPWhJULs5D5NGPPWhUVQe; Tue, 16 Apr 2019 16:50:10 +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=bu8y+3Si c=1 sm=1 tr=0 a=I1eytVlZLDX1BM2VTtTtSw==:117 a=I1eytVlZLDX1BM2VTtTtSw==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=nZOtpAppAAAA:20 a=-e_qiQ_tC5_np7P2fDgA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=pHzHmUro8NiASowvMSCR:22 a=nt3jZW36AmriUCFCBwmW:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 16 Apr 2019 16:48:34 +0200 Message-Id: <20190416144834.20300-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190416144834.20300-1-michael@niedermayer.cc> References: <20190416144834.20300-1-michael@niedermayer.cc> MIME-Version: 1.0 X-CMAE-Envelope: MS4wfEbuXVZZG5UKrQA052BM1po8jLKAGLaYITakut8ovG0qF+xnRTJ22w3O0cHtvooRJH9JH8WtLsVdYn5aD0FYeJwdwLzYU/iI4ExL1eJs80wQPpTTCbnX suuNxDwTDZffXRB2yVRlVbiymbdLklzLSnMzG53eyW8m19ZbHPd0Yy51 Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/jpeg2000dec: Check PLT data somewhat 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 (21sec -> 0.6sec) Fixes: 14134/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEG2000_fuzzer-5768371078955008 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/jpeg2000dec.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 9198cf87cb..62b0b1f9b7 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -832,15 +832,21 @@ static uint8_t get_tlm(Jpeg2000DecoderContext *s, int n) static uint8_t get_plt(Jpeg2000DecoderContext *s, int n) { int i; + int v; av_log(s->avctx, AV_LOG_DEBUG, "PLT marker at pos 0x%X\n", bytestream2_tell(&s->g) - 4); + if (n < 4) + return AVERROR_INVALIDDATA; + /*Zplt =*/ bytestream2_get_byte(&s->g); for (i = 0; i < n - 3; i++) { - bytestream2_get_byte(&s->g); + v = bytestream2_get_byte(&s->g); } + if (v & 0x80) + return AVERROR_INVALIDDATA; return 0; }