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 EFB0644DA6 for ; Mon, 26 Dec 2022 14:08:51 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2BD2B68B9C1; Mon, 26 Dec 2022 16:08:47 +0200 (EET) Received: from mail-ua1-f54.google.com (mail-ua1-f54.google.com [209.85.222.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 077FB6883DD for ; Mon, 26 Dec 2022 16:08:41 +0200 (EET) Received: by mail-ua1-f54.google.com with SMTP id d1so2364994ual.11 for ; Mon, 26 Dec 2022 06:08:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:from:references:in-reply-to:mime-version :from:to:cc:subject:date:message-id:reply-to; bh=e1lYq7ufwXGULWhZhwBztcSF3y8ZeEkP9HMNq8Y32jU=; b=fL6rYQw+l7Ri2xfMEJZZ6PIh5gbpTX4tlbhJV64vRrotMT/7rurLC2IyP7sSyrzY5i BlZxJooo2CTWEqs6JFCQVvLkXd7hHUdZ1AcqKQFAAqmxqe5ke3+6OhSL/jsfMCh5DEnt pov3qZtfvSAYIIddU7noGircvcbaLkStg0vcdeUmwBw8n+WvGVec1IKrYgZ46w5FqF/k Su+qtS3zuYB2iLPwAemRjTyj2VoPlFcJsJ7mJRr3k/Iur2ZYW4n+lT6BW7ag/5/PGPyj 87vrW7X0ZJn+HjavC9iZ6clwQDNXNhu1YWGO79EqtyhKn8+BqHJNcvLgOINcd0HdABaX cZJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:references:in-reply-to:mime-version :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=e1lYq7ufwXGULWhZhwBztcSF3y8ZeEkP9HMNq8Y32jU=; b=nfPbaSI/2qK9Y68+URYpzbzLEf+96jwZsRTIeXrQJiEYYgNa105S5h5dCOLGGbIFFL qLY8mAZJ3O2/z4nY3jCQXu0LoLMEhdZ9gKlDioYIv7GXy11JDeWnxfoMGpHGGBUHwwtl imEU/G9u4UJ2wCvQ3C6SLi4Vwtzd7vaKy/GlM4ein5/DVh/UY50JR1ehOJFI8EteLdQ2 OhXMXvD0fA7//M7rm2sM3Zw0y/UF5nUdWxV9BvwxPTH5qZq9y5HkDqRD3FdW1RgP36XS Lhla1Z6sUI4haelltsZ7pxEnN0Y2HvNK0O7oTvpIbbj5tLv4gXDz2BMuVQ14rF9BOeKx L1fg== X-Gm-Message-State: AFqh2kqtzhlhteSVz2cH7wPqcRpsrglipEQzyuMmyl6DFBUuGoGri4kG PkNmYoDOBSKvl9LBlCn5r4AUZoWjC6k151UHj2pDr+WO X-Google-Smtp-Source: AMrXdXsGMo4/fL2oxS1oii2yIZAnNwPsx8klUAnLLPv+OXepQBfwOXlR4o8OSdk1uP/HnRfxDExopqJsDUwwxHoNq7k= X-Received: by 2002:ab0:1301:0:b0:444:2123:f8df with SMTP id g1-20020ab01301000000b004442123f8dfmr1692628uae.86.1672063719325; Mon, 26 Dec 2022 06:08:39 -0800 (PST) MIME-Version: 1.0 Received: by 2002:a05:612c:2428:b0:32a:5eaa:92e4 with HTTP; Mon, 26 Dec 2022 06:08:38 -0800 (PST) In-Reply-To: <20221225220323.20968-1-michael@niedermayer.cc> References: <20221225220323.20968-1-michael@niedermayer.cc> From: Paul B Mahol Date: Mon, 26 Dec 2022 15:08:38 +0100 Message-ID: To: FFmpeg development discussions and patches Subject: Re: [FFmpeg-devel] [PATCH 1/2] avcodec/hdrdec: Check for end of input in decompress() 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 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: On 12/25/22, Michael Niedermayer wrote: > Fixes: Timeout > Fixes: > 54386/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HDR_fuzzer-5053598268784640 > > Found-by: continuous fuzzing process > https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: Michael Niedermayer > --- > libavcodec/hdrdec.c | 14 +++++++++++--- > 1 file changed, 11 insertions(+), 3 deletions(-) > > diff --git a/libavcodec/hdrdec.c b/libavcodec/hdrdec.c > index 21d3e7f693..998227744b 100644 > --- a/libavcodec/hdrdec.c > +++ b/libavcodec/hdrdec.c > @@ -58,6 +58,8 @@ static int decompress(uint8_t *scanline, int w, > GetByteContext *gb, const uint8_ > int rshift = 0; > > while (w > 0) { > + if (bytestream2_get_bytes_left(gb) < 4) > + return AVERROR_INVALIDDATA; > scanline[0] = bytestream2_get_byte(gb); > scanline[1] = bytestream2_get_byte(gb); > scanline[2] = bytestream2_get_byte(gb); > @@ -143,13 +145,17 @@ static int hdr_decode_frame(AVCodecContext *avctx, > AVFrame *p, > int i; > > if (width < MINELEN || width > MAXELEN) { > - decompress(scanline, width, &gb, scanline); > + ret = decompress(scanline, width, &gb, scanline); > + if (ret < 0) > + return ret; > goto convert; > } > > i = bytestream2_peek_byte(&gb); > if (i != 2) { > - decompress(scanline, width, &gb, scanline); > + ret = decompress(scanline, width, &gb, scanline); > + if (ret < 0) > + return ret; > goto convert; > } > bytestream2_skip(&gb, 1); > @@ -161,7 +167,9 @@ static int hdr_decode_frame(AVCodecContext *avctx, > AVFrame *p, > if (scanline[1] != 2 || scanline[2] & 128) { > scanline[0] = 2; > scanline[3] = i; > - decompress(scanline + 4, width - 1, &gb, scanline); > + ret = decompress(scanline + 4, width - 1, &gb, scanline); > + if (ret < 0) > + return ret; > goto convert; > } > > -- > 2.17.1 > LGTM > _______________________________________________ > 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". > _______________________________________________ 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".