From patchwork Mon Aug 22 14:58:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 37386 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp1343321pzh; Mon, 22 Aug 2022 07:58:45 -0700 (PDT) X-Google-Smtp-Source: AA6agR7i2hv5WzeNT7rjEcJ4jZO58i+5JCH0MLrf4VXM56ZBfuL72IQ/OzPoxvxZ77YLS0KBNUYR X-Received: by 2002:a17:906:3a15:b0:73d:80bf:542c with SMTP id z21-20020a1709063a1500b0073d80bf542cmr3671414eje.633.1661180325645; Mon, 22 Aug 2022 07:58:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661180325; cv=none; d=google.com; s=arc-20160816; b=zsxxTwKUwmQbIVBZMnPOwasa2yMrmyPkMPRt7ixNtIq31C57wZvyesn7ufi3/yhoo+ yddxdx5dngBttRSpNnpaQQwGpWtBTzLMFV23SWSKVbvk2JpojfZuzhEctoV0mXEwwK5b X3usbTGK0mVA7Gne95q07YIs1CyvD8HyQj4YeK5U2bjZj//JITsEg3zGPH3HZKiGbGvU keDybwhCSkOztN+u7sZX6Z3wkXeAffkqvMmAytaVvF8kDt3o3pl8xzwisqFd2nKuOxRp WtHKEBpfu9bwwe1I33vcMFBQjNj8+lrQs+lbTh/ooGQgcjCqg+/AOFjeiC3pKmd1M9K+ 3aVQ== 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=5gJtmEPe2r5rIiiQxQWo7/A/leSN9fprhJoWgtoYrFg=; b=IbYfTrUDzzIwQa4xuUt20VC/+zNb6qSUm7K25LRWSjlH3moPSE5gXGIYUnJl0DmfIg hGkp0pO4ZTIMbLwOLoGtkGWxUPj28mlQ0g+dj2aF3ItGqY7EHBtUFU/OFpADExgOOR/i Et8S5ax3ptZiclEczF4LakimTwdJHtc0seY1ocHr4VV/hUnvfZlSwnPd2zfGnsuciBRd +wTVN/jdXHvDTDK4ezsW14t41/DhA+S7uR5FTJQ+koXRZ0bOODhSZD3SxUyrf5BIaAmu B3Wmgevkg7u3HityvWJ3V1SwZmRoyNNf79fxw07Og4wfCt77WeTtKVZBQRo7mKviwgDi zuSQ== 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 k1-20020a17090632c100b0073301a22cb7si8440694ejk.294.2022.08.22.07.58.45; Mon, 22 Aug 2022 07:58:45 -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 D424C68B612; Mon, 22 Aug 2022 17:58:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at01-3.mx.upcmail.net (vie01a-dmta-at01-3.mx.upcmail.net [62.179.121.147]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2A94F68B612 for ; Mon, 22 Aug 2022 17:58:36 +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 1oQ8ss-00BkP1-VJ for ffmpeg-devel@ffmpeg.org; Mon, 22 Aug 2022 16:58:34 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id Q8sroIRBO8s8UQ8sso0bsW; Mon, 22 Aug 2022 16:58:34 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id Q8srocoKqOPqFQ8ssoXI2F; Mon, 22 Aug 2022 16:58:34 +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=OcX7sjfY c=1 sm=1 tr=0 ts=6303999a a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=9Kd-D6Q8ZPb9-YY5bdUA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 22 Aug 2022 16:58:32 +0200 Message-Id: <20220822145833.10234-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfEMnbs4o+g7K19cAJqRQQpCcgG+ZipkxrRJaKil9nPwOk6J/7tmeqe86HUEnpBf7napkuDyFrG6zpBP1JYIhe8fmQLbIUIN9uHJcHrjD3N4Eklx1vxtS xtvG/sfBn0Ur662hXBALbNFUcMpltKwt/JSz2nQa/qWSlrjomtL2tLei0UH95+7ri/l3vGaAbOpCgA== Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/m101: Move checks before ff_get_buffer() 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: bFtd6tMyexR3 Fixes: Timeout Fixes: 50109/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_M101_fuzzer-6553193986785280 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/m101.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libavcodec/m101.c b/libavcodec/m101.c index 16ea6ede32..440554fdb6 100644 --- a/libavcodec/m101.c +++ b/libavcodec/m101.c @@ -53,11 +53,6 @@ static int m101_decode_frame(AVCodecContext *avctx, AVFrame *frame, int min_stride = 2 * avctx->width; int bits = avctx->extradata[2*4]; - if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) - return ret; - frame->pict_type = AV_PICTURE_TYPE_I; - frame->key_frame = 1; - stride = AV_RL32(avctx->extradata + 5*4); if (avctx->pix_fmt == AV_PIX_FMT_YUV422P10) @@ -69,6 +64,10 @@ static int m101_decode_frame(AVCodecContext *avctx, AVFrame *frame, return AVERROR_INVALIDDATA; } + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) + return ret; + frame->pict_type = AV_PICTURE_TYPE_I; + frame->key_frame = 1; frame->interlaced_frame = ((avctx->extradata[3*4] & 3) != 3); if (frame->interlaced_frame) frame->top_field_first = avctx->extradata[3*4] & 1;