From patchwork Mon Feb 7 03:44:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiasheng Jiang X-Patchwork-Id: 34156 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp5440755iov; Sun, 6 Feb 2022 19:45:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJyepSDqRJdBMA+sXRkl4klEK1HOYbrZgbGDJ+voyuJwsVT839vFM9gXpFd7IUwZXKuTie52 X-Received: by 2002:a05:6402:438d:: with SMTP id o13mr11600565edc.258.1644205513298; Sun, 06 Feb 2022 19:45:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644205513; cv=none; d=google.com; s=arc-20160816; b=pYPJZL3Qxm4KR3BnrAWissa6phvrSo9xBXiXpT0NS59mIv61EnPO8Apt8Bjqo6uKRj Zt1SHxQEazMI+wgnQAHZszEH1VKNqmNF36lERaGpfrT1tT2p+BeOpDYArASccg+LNE9v X24HUJgATqF5JsVo+vcH/N0kTRLaJ+n6Hue7Mb3sGjWa1mpZ2zBAe1asr+5vKfrELo6N NrtVLWKVHU3urSyUDpKXGyOLZIkW9h2BwyynnoH3QTg4Q2XgigTUmM6Sink7aXwUfys1 G0EKJeMT+A2Dx4deRVq5ldEVOuP5OfjeNE0OfMjvkuPw4Grx9CJSpEs4fDax/mpIqw7U f32g== 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=/l7dmVQbujyuvP9fstyHShtY4t41fKlOuRyZTrPVkVw=; b=yTIs2yTd13wblJnrX2DCa2NI0zRuqCHKqRWjN9iktNNWrYlVnOGVjaOy9wX9YdnYBY CkgO4wH+fs2vCzMJ+q0dpqm3K/DFIPUTUjvaejhrWP5QwOe8UQAgsco2+rcxxY/VPYNh FDsOqhVz1UmfEhcgejJF62SrbGMC4mmmDoCW75hjQLCdFAm4dVauMMDmEqmVmioag4qJ 7G53Iy8X3jeaRFDlNrpxYHRF1KuUaG++5YlnvNniu64prnPzmbeYNCbNW9Jhd1BmoqtS YtBCJiM4x7SHz4YwDr2fx8ZekWyCjUwgPffvLw1xwrkPZpymY3jKGYFqWcOJ3Oz41suC 8TAA== 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 b9si7515375edd.307.2022.02.06.19.45.12; Sun, 06 Feb 2022 19:45:13 -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 3057F68B0DD; Mon, 7 Feb 2022 05:45:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from cstnet.cn (smtp23.cstnet.cn [159.226.251.23]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D403768B0DD for ; Mon, 7 Feb 2022 05:45:00 +0200 (EET) Received: from localhost.localdomain (unknown [124.16.138.126]) by APP-03 (Coremail) with SMTP id rQCowAB3l5i4lQBi45xfAA--.13702S2; Mon, 07 Feb 2022 11:44:56 +0800 (CST) From: Jiasheng Jiang To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Feb 2022 11:44:53 +0800 Message-Id: <20220207034453.734942-1-jiasheng@iscas.ac.cn> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CM-TRANSID: rQCowAB3l5i4lQBi45xfAA--.13702S2 X-Coremail-Antispam: 1UD129KBjvdXoWruFy8tFykCFWfWr4xGFW8tFb_yoWDWrg_AF 97WF4DZr1UC3s2kwsIkrs0k34fZrWkZF48t3ZagrWfJ3yqq3WxXrnFg3s0vw43Wrnagr9x KF4qyrnxZwnaqjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbckFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8w A2z4x0Y4vE2Ix0cI8IcVAFwI0_Jr0_JF4l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Jr0_ Gr1l84ACjcxK6I8E87Iv67AKxVWxJVW8Jr1l84ACjcxK6I8E87Iv6xkF7I0E14v26r4UJV WxJr1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E 2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJV W8JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I648v4I1lc2xSY4AK67AK6r48 MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr 0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUXVWUAwCIc40Y0x0E wIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJV W8JwCI42IY6xAIw20EY4v20xvaj40_WFyUJVCq3wCI42IY6I8E87Iv67AKxVWUJVW8JwCI 42IY6I8E87Iv6xkF7I0E14v26r1j6r4UYxBIdaVFxhVjvjDU0xZFpf9x0JU2FALUUUUU= X-Originating-IP: [124.16.138.126] X-CM-SenderInfo: pmld2xxhqjqxpvfd2hldfou0/ Subject: [FFmpeg-devel] [PATCH] avcodec/vp6: return value check for av_mallocz 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: OV8Fmy7FLFCe As the potential failure of the av_mallocz(), the 's->alpha_context' could be NULL and be dereferenced later. Therefore, it should be better to check it and deal with it if fails in order to prevent memory leak, same as the av_frame_alloc() in ff_vp56_init(). Fixes: 39a3894ad5 ("lavc/vp6: Implement "slice" threading for VP6A decode") Signed-off-by: Jiasheng Jiang --- libavcodec/vp6.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c index d024370793..d75e717082 100644 --- a/libavcodec/vp6.c +++ b/libavcodec/vp6.c @@ -653,6 +653,10 @@ static av_cold int vp6_decode_init(AVCodecContext *avctx) if (s->has_alpha) { s->alpha_context = av_mallocz(sizeof(VP56Context)); + if (!s->alpha_context) { + ff_vp56_free(avctx); + return AVERROR(ENOMEM); + } ff_vp56_init_context(avctx, s->alpha_context, s->flip == -1, s->has_alpha); ff_vp6dsp_init(&s->alpha_context->vp56dsp);