From patchwork Tue Feb 22 07:23:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiasheng Jiang X-Patchwork-Id: 34440 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp4098261nkx; Mon, 21 Feb 2022 23:23:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJzlcbPr0aFdyGEONvnGOw5eusmAGyXIt0PWK8pxEY/JgRgt7jCNZoCs+CjUW7de9xYK2JmE X-Received: by 2002:aa7:df12:0:b0:410:a50b:de00 with SMTP id c18-20020aa7df12000000b00410a50bde00mr25153370edy.2.1645514621653; Mon, 21 Feb 2022 23:23:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645514621; cv=none; d=google.com; s=arc-20160816; b=Wd9O/c1VuskN6jNyD4zm9fcg5M6GpnWD70+obI3DAnmc3JjJ2IBKdMcgLti4jI8YCT FAnzr7yZB1dG7ikqQFbBSoUWERU4Rn5eKAeuQCStWnPyrJLFt/9CEKA9o968k84TaPE6 jgE/z9fkCkD5dos8anQwTPpZXBb59KeyWPVObA5LqL4PFggtyp30c3lvMU3qvYd7k91i 4gUxSZQnLTrMLlkYI4BSsbnmi67W7bjc6pOW+2lXWjxxZe29XAH5d1DO3hu+6YuLIPR8 WvHFx5x92AXmGleOVsg0kzFqilmM2wLffAczKwvNPGVFkOBUmRiTMXYVj7rg+1ZuErBU 7NSg== 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=6qDk9XfgaC1Isytmw3i1f4SMLlUubpH+xXJqHT4u5Ws=; b=oMFKU3e00WKV2CTPhn0pd7r7FHf5iS5us6xWeNzPxYu+sUD6EnfWnpJxlmAAsddkyh nKDcW8kS1tV4sXlnabOi2CSjnd3cMZ7daouYR++IoV95tGoYgzYyTq5opuMMHQh5Zf01 EH+6evjlo5Xda9Ia+VME3jnd5+DCeFjloG00DlUijy4iKU80Y1N/JLlrbqB74hYnAdcW Yrgwg/qd1aKwT3gMUYiqz6HFqqF16GrYA9ky0wsJbWQXR2csIUOo2sDKLrl4EE1CJKw9 19VvPsBghZ2x7Ge1zSN4PVjpe1dt1RUwiNVSXfweXPuRkJSECvh7IVuOpj0t3V5McJ7W +0vg== 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 c1si11211650eds.255.2022.02.21.23.23.40; Mon, 21 Feb 2022 23:23:41 -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 22D7A68B054; Tue, 22 Feb 2022 09:23:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from cstnet.cn (smtp21.cstnet.cn [159.226.251.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DA107689BC6 for ; Tue, 22 Feb 2022 09:23:29 +0200 (EET) Received: from localhost.localdomain (unknown [124.16.138.126]) by APP-01 (Coremail) with SMTP id qwCowABXX_tsjxRiAFtLAQ--.42791S2; Tue, 22 Feb 2022 15:23:25 +0800 (CST) From: Jiasheng Jiang To: ffmpeg-devel@ffmpeg.org Date: Tue, 22 Feb 2022 15:23:23 +0800 Message-Id: <20220222072323.2685366-1-jiasheng@iscas.ac.cn> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CM-TRANSID: qwCowABXX_tsjxRiAFtLAQ--.42791S2 X-Coremail-Antispam: 1UD129KBjvdXoW7JFyfur47uFy3GF15AF13Jwb_yoW3Zrc_AF srJF1DG3WDGas2ya17GF4jyr1fuwn8Aa1xKFnxKF43JF98AFsFgFWUXrsY9a13u3yqv3s8 G34vk34SqwnIgjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUb48FF20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8w A2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr0_ Cr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVCY1x0267AKxVWxJr 0_GcWle2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E 2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJV W8JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I648v4I1lc2xSY4AK67AK6r4x MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr 0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUXVWUAwCIc40Y0x0E wIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJV W8JwCI42IY6xAIw20EY4v20xvaj40_Wr1j6rW3Jr1lIxAIcVC2z280aVAFwI0_Jr0_Gr1l IxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7VUjKFAPUUUU U== X-Originating-IP: [124.16.138.126] X-CM-SenderInfo: pmld2xxhqjqxpvfd2hldfou0/ Subject: [FFmpeg-devel] [PATCH] avcodec/magicyuvenc: Add check for av_frame_clone 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: q7dSjvlQ0yh/ As the potential failure of the memory allocation, the 'p' could be NULL pointer. Therefore, it should be better to check it in order to avoid the dereferencing of the NULL pointer. Fixes: 3729ae659f ("avcodec: add MagicYUV encoder") Signed-off-by: Jiasheng Jiang --- libavcodec/magicyuvenc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/magicyuvenc.c b/libavcodec/magicyuvenc.c index ab32d4cee3..b763916b87 100644 --- a/libavcodec/magicyuvenc.c +++ b/libavcodec/magicyuvenc.c @@ -454,6 +454,8 @@ static int magy_encode_frame(AVCodecContext *avctx, AVPacket *pkt, if (s->correlate) { uint8_t *r, *g, *b; AVFrame *p = av_frame_clone(frame); + if (!p) + return AVERROR(ENOMEM); g = p->data[0]; b = p->data[1];