From patchwork Thu Apr 29 20:09:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27486 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a11:4023:0:0:0:0 with SMTP id ky35csp1850186pxb; Thu, 29 Apr 2021 13:10:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyFBiju//jKhhdofODmF6aXBtfL/5ngmXakgS8vgBNymvU1L+SWeAAJz2/xtygXudgboxhp X-Received: by 2002:a17:906:2a16:: with SMTP id j22mr231705eje.397.1619727050108; Thu, 29 Apr 2021 13:10:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619727050; cv=none; d=google.com; s=arc-20160816; b=Ut29IAtGB4KB0MaxzXs8s2pMUby9GgZEWWgoKEwc2MAWmPdtpd0gbrHmua4FI/ibXF 0FTupLNiRKt0HlA6E1qDRmvE7XutR0++cHjoA9J31C8uoC/PpY6BMhf2H9i4Kq8UfOIE gOPnSLwX9JhDw+0cAwDzfb2voWIWRrhn+2Z53T4TmmbkfoHteHMBZXcJUzobZzfjGFJh AnH0xVhE8g1yoXVaToSp1cirY11BmwTu+JjU+Nkm4dfwOYJfDTOunGrcB/sqGN3DL4CR iBUAXIXyEzPBFoQjvEPWUKVQ2wxgtGqXzJnlYvrFH7RugyzeHCAHLpnE3+WDUvcY4Ezb +kmQ== 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:message-id:date:to:from:delivered-to; bh=ppegtcgTjzsAIEyanJplC7eiSMLrMChpOB/+2FMhCiI=; b=E+oKpagLwPbY8J+FgdLu/iW3VceJ0oTFsV4VHSDwjNijXsQs4tc0tXG5CN4G06CdsE o1MjiMkBb0NafRIUUI/Fwdi2hBiVVlCc3XlN9Oj8w5KOt5zqN8LsJqaXeyb6HMuvWfxG xc0mplu+4DqMBBqQPcTq0MQLVHMWhrs4bOSTf4rOn3IZjxwfaR03uPorXzi3GWlVvyRg 2K1s7BN39mZAubk3SiEu1sVBBxRwTptkdi6FS5zmkXM8dRwmyFkevkSMQvYh40Ee05Q3 fDh84B+NfgYqKabpSSaxRICcgUKQqnmHunpZ4zjXK3/cxOmhXMeV9xTC2SrRi3JsakKU Zazg== 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 g12si999959ejj.311.2021.04.29.13.10.49; Thu, 29 Apr 2021 13:10:50 -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 083DC680B68; Thu, 29 Apr 2021 23:10:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe06-3.mx.upcmail.net (vie01a-dmta-pe06-3.mx.upcmail.net [84.116.36.16]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A5E91680B68 for ; Thu, 29 Apr 2021 23:10:37 +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.92) (envelope-from ) id 1lcCzd-00FiPO-0A for ffmpeg-devel@ffmpeg.org; Thu, 29 Apr 2021 22:10:37 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id cCyflCnDTljeHcCyflaHxQ; Thu, 29 Apr 2021 22:09:37 +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.3 cv=BoHjPrf5 c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=nZOtpAppAAAA:20 a=n2oZRq0-Jm5g3UMbkHQA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=jd6J4Gguk5HxikPWLKER:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 29 Apr 2021 22:09:37 +0200 Message-Id: <20210429200937.8825-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfNBLtwz8h10giOXXwnpvAs4xUf736NrN/HmJGP3STBCpnIvdCDNQLHDf9eKQ+p1BqTATugXDTaJsOJMsutbCPD6M2m2acirvOK85I0UcLvt/1RMiaAF3 zR+Mf3rXSJ6ZjaGxYBOePn7SHph+CzdxqiT8le4iZgL9ScKzYaCtihkR Subject: [FFmpeg-devel] [PATCH] avcodec/utils: treat PAL8 for jpegs similar to other colorspaces 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: bCvkspq/rQTq Fixes: out of array access Fixes: 33713/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MJPEG_fuzzer-5778775641030656 Related to: c8197f73e684b0edc450f3dc2b2b4b3fb9dedd0d Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/utils.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index e5e239fd98..afb11e718d 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -272,6 +272,14 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, w_align = 8; h_align = 8; } + if (s->codec_id == AV_CODEC_ID_MJPEG || + s->codec_id == AV_CODEC_ID_MJPEGB || + s->codec_id == AV_CODEC_ID_LJPEG || + s->codec_id == AV_CODEC_ID_SMVJPEG || + s->codec_id == AV_CODEC_ID_JPEGLS) { + w_align = 8; + h_align = 2*8; + } break; case AV_PIX_FMT_BGR24: if ((s->codec_id == AV_CODEC_ID_MSZH) ||