From patchwork Sun Jul 3 00:31:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 36618 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp1932832pzh; Sat, 2 Jul 2022 17:32:16 -0700 (PDT) X-Google-Smtp-Source: AGRyM1t9DbnEzp2/m2lQs/XqKZp7zqIereswbJLrAEwAA0Ws31gvnXwjRbLcYmq+XoSq0LqLKxYe X-Received: by 2002:a05:6402:e9f:b0:435:644e:4a7d with SMTP id h31-20020a0564020e9f00b00435644e4a7dmr28604152eda.114.1656808336600; Sat, 02 Jul 2022 17:32:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656808336; cv=none; d=google.com; s=arc-20160816; b=wSvZ35G4MphZZxoQqxrFnROJ3Xx8h7cJfEzzS9pAtbzkHKHOFqJlEb1RZGCYSG6Hb3 vIzWreqMaNbHs71Ca3B2l5xGLZisYAA2W2PT6InGshH0cxbBl/MEPhDzfk3vM8VpLTCX oDHY3tDcmnlEmXjt+PxBYDsloKO3UCnUFq/1IE5Suw/uQ4vs0nNAEbufkUPEdJl7KWoD d4HsTTMJroKGJVgYwdtPJ3vS82EOvR7w/83Ztp1UC34lxlpbeht1TFVdTHVzjx2gGbj8 /txw+8rBcwitySMXTH9WpxvUIf19MQUq5PH/k4Df2gfH2bJmg8bl4CLGv99CNJvbXiAt /C8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=Qv/VfIeGOkZCHdobMMQRSaTd2NlDBX1Qsb5kMxKm6nU=; b=gpzeMObW8JRlk8dGV7qCdoCi65h0kwog/KhcPB8SsrAJmDHSEGTSt4lyZXawyWyWWK +1NMWZrqTVzlDC5fgO2VON4WfW1/fHVSGJ2a/xApt2B5KDvR8asI3qNSjLupRzy1+Kdf rR42U923NhXvC8hca2ftQhRxa6v/xxwDDzG4bj68VPWmxhflJfVSzR94zR2BdFj8pfkA SEWxaruOhv2UJ9gAJeZpaon2QKYDzW+R8cuLQ0MUxSzmmohTVwweEzKgVcoXd1VL+n0s qWYjVhFNHg7TgwgPAgSmDnvgFkeZTpzq/a5FGBDMll1wr5vr6zCMhmepduSuEK1piFx8 MJBQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hu9-20020a170907a08900b007157046560csi7250544ejc.884.2022.07.02.17.32.16; Sat, 02 Jul 2022 17:32:16 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 19BB868B970; Sun, 3 Jul 2022 03:32:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at01-1.mx.upcmail.net (vie01a-dmta-at01-1.mx.upcmail.net [62.179.121.145]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2103768B91A for ; Sun, 3 Jul 2022 03:31:55 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1o7nWk-001ji2-Ik for ffmpeg-devel@ffmpeg.org; Sun, 03 Jul 2022 02:31:54 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 7nUxo2thH8s8U7nWkodISH; Sun, 03 Jul 2022 02:31:54 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id 7nWkosU9H8eSW7nWkooHQU; Sun, 03 Jul 2022 02:31:54 +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=KKE5sHJo c=1 sm=1 tr=0 ts=62c0e37a a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=yDO2GySLOFfm-oxmxNgA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 3 Jul 2022 02:31:50 +0200 Message-Id: <20220703003152.17850-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220703003152.17850-1-michael@niedermayer.cc> References: <20220703003152.17850-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfEOAgD7e9tw/8KH2kXEJ8lM8OfhhDZ7URSsJM/IipA01zOePOxyNsldCHtd5uZQG2SYm4X+TRmydGQN+JmGJuuDddtEjWmvPQy1SjRWTAeDlAuj7r9ko 6G0q9qaI17rSbL4nOb9BYEHfmWaV/1baHtgVt/OIq9Qqx44ccw3oql28g8d5K22CbCgxf3awPK+BYQ== Subject: [FFmpeg-devel] [PATCH 4/6] avcodec/qdrw: adjust max colors to array size 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ZYTVQkIhFQwF Fixes: out of array access Fixes: 48429/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_QDRAW_fuzzer-4608329791438848 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/qdrw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/qdrw.c b/libavcodec/qdrw.c index 849d4a5cad..ff8f97713d 100644 --- a/libavcodec/qdrw.c +++ b/libavcodec/qdrw.c @@ -368,7 +368,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *p, bytestream2_skip(&gbc, 18); colors = bytestream2_get_be16(&gbc); - if (colors < 0 || colors > 256) { + if (colors < 0 || colors > 255) { av_log(avctx, AV_LOG_ERROR, "Error color count - %i(0x%X)\n", colors, colors); return AVERROR_INVALIDDATA;