From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 6584043CD5 for ; Thu, 6 Oct 2022 20:37:21 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 86E6168BB26; Thu, 6 Oct 2022 23:37:19 +0300 (EEST) Received: from vie01a-dmta-at03-3.mx.upcmail.net (vie01a-dmta-at03-3.mx.upcmail.net [62.179.121.153]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C528568BA96 for ; Thu, 6 Oct 2022 23:37:12 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1ogXcF-00ATUp-E3 for ffmpeg-devel@ffmpeg.org; Thu, 06 Oct 2022 22:37:11 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id gXc7oWRDf8s8UgXcFogS44; Thu, 06 Oct 2022 22:37:11 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id gXcFoBvJJbZLDgXcFoh44T; Thu, 06 Oct 2022 22:37:11 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=Ufwy9IeN c=1 sm=1 tr=0 ts=633f3c77 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=g15dB-8DGuoNj2nd:21 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=4MpObu1hbx339PFoaQ4A:9 a=GdR-FnjLSxcwICsfAHBS:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 6 Oct 2022 22:37:09 +0200 Message-Id: <20221006203709.8398-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221006203709.8398-1-michael@niedermayer.cc> References: <20221006203709.8398-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfMmhGhszfE/rX300yfZvshp2ddiyimF9go0XzWKF+cCxcUKzK1gaT3AlLkyHBhXSbu8QInQCJHlaSp/OLOVPvyuhLTBCfyi2w7Vqtk0D46rpMiiQ2Vsm 7WJra8VmISvHnBYetCu4/pwNFVVCTxPk0RGH8XRaV2RgBh4tT7cLakRHIMUPBZn2CUItadGHNmTrwQ== Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/speedhq: Check buf_size to be big enough for DC X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Fixes: Timeout Fixes: 51919/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SPEEDHQ_fuzzer-6023716480090112 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/speedhq.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/speedhq.c b/libavcodec/speedhq.c index 6dbba02776a..04ba4dd19c5 100644 --- a/libavcodec/speedhq.c +++ b/libavcodec/speedhq.c @@ -500,6 +500,8 @@ static int speedhq_decode_frame(AVCodecContext *avctx, AVFrame *frame, if (buf_size < 4 || avctx->width < 8 || avctx->width % 8 != 0) return AVERROR_INVALIDDATA; + if (buf_size < avctx->width*avctx->height / 64 / 4) + return AVERROR_INVALIDDATA; quality = buf[0]; if (quality >= 100) { -- 2.17.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".