From patchwork Mon Apr 17 02:32:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiasheng Jiang X-Patchwork-Id: 41220 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp2045249pzb; Sun, 16 Apr 2023 19:32:31 -0700 (PDT) X-Google-Smtp-Source: AKy350aHIk6AG59dviXrjGD/UzlUlyS67yqr3hjIKwYPWns8L/Zq6eW2pX7Fgars15JAhywvwzgG X-Received: by 2002:a17:906:240d:b0:94e:8556:f01c with SMTP id z13-20020a170906240d00b0094e8556f01cmr6004669eja.57.1681698750806; Sun, 16 Apr 2023 19:32:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681698750; cv=none; d=google.com; s=arc-20160816; b=gYph//7877HQjpqg+WWeq23rLtevmXlCLahmnLxBbyRHdfhbKbz0VId+fIw/+ZYABW ru/gM5MA6YLimmAgtBylP8khqmcjcMbhUEgt/zoIG2n9ypWgUtnGvYsIJfrJaq7aPEK7 szmNb5HMWg+GgzgeQHGhx+CBcr/kN9DZmY4BP7q7vcjTTVeidNm44JKlder91ZhOgtEg bc2ISqXuSWeB/znYz5oUBTdeOZKwaOug/5oHnLwoVf0G29+sIEWVtoKdUC/Zuq99gMAO bYZPaZGi0hrEduVvBQgPf1S05Jk3VEnyLZ0Lctfw7AiYGkFqGPeL8UUPyTKagbT0IzSn CMbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=IOYOPA66KQWqYfCLoowevG6aeTdB5Jtklf5WPNuhuR0=; b=wB6CrHGxJ4+uzFJ1IRL6F+HvCcheuoJmjkQVH7yPF2dU1Sdrr/5CkDaTXl+5yy7TbS 5vWms6kGlZ55bbR/jmOvuNO5v19Kn60uyrc7kZxhmTyxTMcPVvigI7k1IQRvNpmQUqZm TDFQPUQoIEjPJsjQsskh1b+lrQIV9nquQefWeoKM50DEeejS1NG1wpn/V795R8C9FGyK ye5X4ccNrQZ66oXU509kNQkbROs55FtYXXCVqlKim+ME4923J4HOWzW85BdAyaez9DJN eQehNv+taYK4yAjyYuiZ1EUlDt5AxAd4lqbkA673ZggTu2s9y9rJEAKc7WfxGhZI4Z5Z F5KA== 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 h4-20020a17090791c400b0094f5777ef96si2073502ejz.1000.2023.04.16.19.32.30; Sun, 16 Apr 2023 19:32:30 -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 6E65068BE10; Mon, 17 Apr 2023 05:32:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from cstnet.cn (smtp25.cstnet.cn [159.226.251.25]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8032768A7E3 for ; Mon, 17 Apr 2023 05:32:18 +0300 (EEST) Received: from localhost.localdomain (unknown [124.16.138.125]) by APP-05 (Coremail) with SMTP id zQCowAAnL1+urzxkudW4Ew--.220S2; Mon, 17 Apr 2023 10:32:14 +0800 (CST) From: Jiasheng Jiang To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Apr 2023 10:32:12 +0800 Message-Id: <20230417023212.46507-1-jiasheng@iscas.ac.cn> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CM-TRANSID: zQCowAAnL1+urzxkudW4Ew--.220S2 X-Coremail-Antispam: 1UD129KBjvdXoW7Gw15Jw1rKr17KF48tryxKrg_yoW3Xrc_tF y7C3WkXa48Cr4SyanFyrZ8tr1Fv3y8ArWIg3ZIyFnxGrZxuFsxZw47uF1Fyws5ua9xAr13 C34jvry7Jr12gjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbc8FF20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8w A2z4x0Y4vE2Ix0cI8IcVAFwI0_Gr0_Xr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr0_ Cr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVCY1x0267AKxVWxJr 0_GcWle2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E 2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJV W8JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I648v4I1lc2xSY4AK67AK6r4U MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr 0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUXVWUAwCIc40Y0x0E wIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJV W8JwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAI cVC2z280aVCY1x0267AKxVWUJVW8JbIYCTnIWIevJa73UjIFyTuYvjfU5vtCUUUUU X-Originating-IP: [124.16.138.125] X-CM-SenderInfo: pmld2xxhqjqxpvfd2hldfou0/ Subject: [FFmpeg-devel] [PATCH] avcodec/rv34: Add check for av_malloc 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 Cc: Jiasheng Jiang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: kRqoq5lizDo2 Add the check for the return value of the av_malloc in order to avoid NULL pointer deference. Fixes: b86ab38137 ("Add weighted motion compensation for RV40 B-frames") Signed-off-by: Jiasheng Jiang --- libavcodec/rv34.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index 45f64666f8..51f18147af 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -1692,6 +1692,8 @@ int ff_rv34_decode_frame(AVCodecContext *avctx, AVFrame *pict, int i; r->tmp_b_block_base = av_malloc(s->linesize * 48); + if (!r->tmp_b_block_base) + return AVERROR(ENOMEM); for (i = 0; i < 2; i++) r->tmp_b_block_y[i] = r->tmp_b_block_base + i * 16 * s->linesize;