From patchwork Mon Apr 17 02:32:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiasheng Jiang X-Patchwork-Id: 41221 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp2045379pzb; Sun, 16 Apr 2023 19:33:05 -0700 (PDT) X-Google-Smtp-Source: AKy350blhEocZS4o0MBa3+5m6NQQYvtUHGhwFDmlk3OuzVmA8jzXi2QKilPtutFAI2+9G8IN0dzx X-Received: by 2002:aa7:cb09:0:b0:506:a596:3577 with SMTP id s9-20020aa7cb09000000b00506a5963577mr2035428edt.16.1681698785530; Sun, 16 Apr 2023 19:33:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681698785; cv=none; d=google.com; s=arc-20160816; b=Zre3gQ4mLY8MR1SrIG9Wxjm43HK3zMoHerNCoMNxEBZsBMnzJVWZtRyZuYwPJvRvFU 25WQ7X8tz7WEy9BfQddahwNp0GfRy01hMl2669GFKu5PXWiG1ovs/b9XZRc7UfuFECaU Y0r1Fy2LeoCEGrsbRd0O/fEsowTzzHrWcyeriYuBAbp5b4TdMl7wOEBHFAWAtb+44FTR 8AYP3674YEZEmbJQFeWpZttvGjthgXSRKICGeIT/z18a3A92lnyQ94HBVX/OgS0aE3dc aS8J0UscnyNwmRjTODQOeaobfij12NNdCOTC7k1yFQNmdEWKM1mSakXGP63NJ8TVRFZJ T8uA== 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=1ih4QLhCufKt0Atz9VvyQxmKx5Ds5CHjiwv1jStWfAw=; b=sqEk5qhSf5+LYkYwI22NPo5mKuCoUUdpca2GHO0U4ZPKaiJaHblDCMT2HfejalLUiR 9hljIqyDt11Ywwb2nxL+OLGR+lf8EFGYQx+oF112RzZki07E1fUAyhKmS1j0nJ0NJKfV QyR8gJmTz5eZVIeMnzKGCYGAQJauHRkhfdTNG1Wv6SI7rUKFrcAqcRFUxxSYG1E0XrUB qOYoa2/Nkurp5UvPxxh9jQWO7J7+9hvRNtVr/+o6LpwkWWU2OiGmnRTrEFbDLpd0ZSIx buslvLKUgRDGsMpGQm7n0xRYuPTdzcbtPfwnLfYNnEkLL6fnJwqY9oJLuLqsBteraYwq YKCw== 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 p14-20020aa7d30e000000b005067db4787fsi7283610edq.515.2023.04.16.19.33.05; Sun, 16 Apr 2023 19:33:05 -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 AC01968BD27; Mon, 17 Apr 2023 05:33:02 +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 2A21968BD27 for ; Mon, 17 Apr 2023 05:32:54 +0300 (EEST) Received: from localhost.localdomain (unknown [124.16.138.125]) by APP-05 (Coremail) with SMTP id zQCowAAXHWXUrzxkt+a4Ew--.209S2; Mon, 17 Apr 2023 10:32:52 +0800 (CST) From: Jiasheng Jiang To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Apr 2023 10:32:51 +0800 Message-Id: <20230417023251.46560-1-jiasheng@iscas.ac.cn> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CM-TRANSID: zQCowAAXHWXUrzxkt+a4Ew--.209S2 X-Coremail-Antispam: 1UD129KBjvdXoW7Gw15Jw15tFy3JFy7tF45Awb_yoWfGwbEyF yxJrWDWry8GrZ2yF4UtryYkr18A34qvw1jkasIqFsrCrZ8JF9xZ3y7XrZY9w48CanrZrn0 gw1jyry7uFyqqjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbc8FF20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8w A2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr0_ Cr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVCY1x0267AKxVWxJr 0_GcWle2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E 2Ix0cI8IcVAFwI0_JrI_JrylYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJV W8JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I648v4I1lc2xSY4AK67AK6r4U MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr 0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUXVWUAwCIc40Y0x0E wIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJV W8JwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAI cVC2z280aVCY1x0267AKxVWUJVW8JbIYCTnIWIevJa73UjIFyTuYvjfUojg4DUUUU X-Originating-IP: [124.16.138.125] X-CM-SenderInfo: pmld2xxhqjqxpvfd2hldfou0/ Subject: [FFmpeg-devel] [PATCH] avcodec/msvideo1enc: 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: ZY0fvsLz8JGi Add the check for the return value of the av_malloc in order to avoid NULL pointer deference. Fixes: e4be3485af ("MS Video 1 encoder") Signed-off-by: Jiasheng Jiang --- libavcodec/msvideo1enc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/msvideo1enc.c b/libavcodec/msvideo1enc.c index 36cfd39a85..1fb8be8883 100644 --- a/libavcodec/msvideo1enc.c +++ b/libavcodec/msvideo1enc.c @@ -84,6 +84,8 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, if(!c->prev) c->prev = av_malloc(avctx->width * 3 * (avctx->height + 3)); + if (!c->prev) + return AVERROR(ENOMEM); prevptr = c->prev + avctx->width * 3 * (FFALIGN(avctx->height, 4) - 1); src = (const uint16_t*)(p->data[0] + p->linesize[0]*(FFALIGN(avctx->height, 4) - 1)); if(c->keyint >= avctx->keyint_min)