From patchwork Fri Feb 25 15:29:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34520 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp236777nkx; Fri, 25 Feb 2022 07:30:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJyabR2Xd+6Taby6mAzFaH6nW7ui1qW9F0wxVKxOq63mvULpGJSqsKbFHUwLLtakL2dDaex+ X-Received: by 2002:aa7:dbd6:0:b0:408:4a31:97a5 with SMTP id v22-20020aa7dbd6000000b004084a3197a5mr7802156edt.186.1645803008599; Fri, 25 Feb 2022 07:30:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645803008; cv=none; d=google.com; s=arc-20160816; b=0CD6Avfp6/lbKPUBiwuPGI2hi3A+rsAdQKnvlrMUETcyCzk5sc4sVJbNS+OLNE+97E etVvs0mTDEBYIzmjbt9T0FYQDvvMacO7W1pJyj5atRBceRhASJt4sngY3teXRjvnnYB8 /25SF2Ke7dwAchmcd6v014D++sGaH5aPw0xT+2Hs3G7jWXYVJFFUtsALSaEnqeYBPZ73 B8AQG1DSW/Y7zV5dFP/bDw6cJtkHzZHWllN4ovhrbqDMt/bo52vvVJgtmP6tTCTdu1wf 0Y8MfOfO6iIKG/Z0rNdJK7an/t5mCuw3AHxJr0rcDgwrWmS0WBAuNUjxL7Gi7nUxdNFg PTUQ== 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=VLDGhKqU/BL8xnYFvuZior8McPGWrWJTUWcbqcyLRq4=; b=E6g41QHqXBAWOes2PPqWN1Oq26/daTlQW4sODAmHIoP7OroFtC6A5z+G0hh3XXoXG8 EyHsROotOO9iPjNZnIWhj7l1keGiFEwf6v2Ld3tcWzwQ8P1FSExNLjT+DRdLQ495TrRc yWGz2JllREHUWMTrlzrDULqww8/D1kIj7lUvLrg+jyUUoz0vbbrzmPNGguUxXHbWD1D/ cg1jC9GSU5i/9oy/JwXHnpsIODQWY4QZ2H7qWCJiGVaW0caQL9gRokvCFYtV4I1HfbWE ARYz7Xh14DPKRvjrXlbO1SS91lQ/H2PWalnRVZlIIJ8Q7ruZcrUWwK0It+SDbaaU2OLr 2cHg== 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 o27-20020a05640219bb00b00410f41c6358si2046809edz.176.2022.02.25.07.30.07; Fri, 25 Feb 2022 07:30:08 -0800 (PST) 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 794EB68B2D2; Fri, 25 Feb 2022 17:30:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 C095168AE81 for ; Fri, 25 Feb 2022 17:29:56 +0200 (EET) 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 1nNcXb-0007CK-Dy for ffmpeg-devel@ffmpeg.org; Fri, 25 Feb 2022 16:29:55 +0100 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id NcWMnXqrhSgGFNcXbnpHjL; Fri, 25 Feb 2022 16:29:55 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id NcXMnx7fIOPqFNcXMnxj8h; Fri, 25 Feb 2022 16:29:40 +0100 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=OcX7sjfY c=1 sm=1 tr=0 ts=6218f5f2 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=VYj98QBoaR-2KKFUsnAA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 25 Feb 2022 16:29:40 +0100 Message-Id: <20220225152940.26446-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfDAg49qG9mxcybXJaogkUwaleg7sBQkEPi/onL+PZZd5iPq9ILfIse8AU7Zak55VaHR/qzkYL6cguS994UCtq2ML57XVMO8aoyOueyO7b8bb5MUKKfkf gD+jCYBQ7sJjbb3lMLI/fqvQlYjF42lr8c2VajTsOcJUZG2Rsj/HU2a42RJoWa02S00ZYwRag/r6WQ== Subject: [FFmpeg-devel] [PATCH] avcodec/h263dec: Check input size before GEOV/GEOX special case handling 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: 5HdYA79wNH4p Fixes: Timeout Fixes: 44921/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MPEG4_fuzzer-6546588791603200 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/h263dec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index e940b7f7c7..56a41f6d05 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -702,6 +702,7 @@ frame_end: if (s->last_picture_ptr || s->low_delay) { if ( pict->format == AV_PIX_FMT_YUV420P + && buf_size*16LL > s->mb_num && (s->codec_tag == AV_RL32("GEOV") || s->codec_tag == AV_RL32("GEOX"))) { int x, y, p; av_frame_make_writable(pict);