From patchwork Tue Feb 15 09:58:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiasheng Jiang X-Patchwork-Id: 34302 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:90eb:0:0:0:0 with SMTP id a11csp146544nkf; Tue, 15 Feb 2022 01:58:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJzDJtkopxUOC4GPiQtBqf64yJeW1YB4FELBb2sRVggEWH76k3nS/0i5ZVEDeQJo2kRMUz+/ X-Received: by 2002:a17:906:5186:: with SMTP id y6mr2260684ejk.40.1644919119394; Tue, 15 Feb 2022 01:58:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644919119; cv=none; d=google.com; s=arc-20160816; b=yorq1RU52l4x4n7ZTVqbzwAqq1x2VgQmhkVLHoIhrR/ZNfbE8EkM3H94IpvFebob83 2lwJSmm+JzB6bL+ucHxYTw54UriaxZjfnUfqd50YDvQIszySEMs+2gryAomHrKvXPiEj hiAVptD6+IeGEVmDYTQeeQSA3TxoTuRC19dE4ryT3X2LSHxHREQoh+/3Ls8EI/luJ9DO ZSaz1vZB/g6qir2VchNO1bLq12nfa0fTEVhGjRk/+3dueUrKnufQ+YZZUJIlKsuSJvo9 AkHR7+pasA8GMFEbVkOkNHWdE5YCAKQfciS37rf3cNwxH6JAp8GRO86dlylK9f9idBXI +GgQ== 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=SgoXgL56zJbjB5iOrI6zAmYotJ9Bdp1fvnoAQNk7Sas=; b=iD+MnYnAWqnrBFszNVLRfNAybMYIPuGQ+qqUwmLJLBfQ9Kjwpcx+VohBqcGuxHaX0o JYpAYa0BAzNQALZppua2dkh7OLli++SfzM9Ytn5ErodRepvOiDVGGtualtpAbvA+/FGf wbLDcBuyCFZgjYyHUTRuCUkE6Hxud0NJtP5RX8xVVGj2DkyocqN6VbOFYbyg5xTepQB8 qDmCBqa7OkHgn2K7mbT9hIW1UrgXOQVkIgujJqHK2vVSWMI3zX8+9Ubz3wZm59pWphAr u7rHanckclMtTIkMOLxaV+JvvYnSN559cDNQtuZUPT6tJ+D4APimDXxThvdRb43Tobyx 0AzA== 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 jg11si1592077ejc.251.2022.02.15.01.58.28; Tue, 15 Feb 2022 01:58:39 -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 9C68F68B2C7; Tue, 15 Feb 2022 11:58:24 +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 46FF568AF2E for ; Tue, 15 Feb 2022 11:58:15 +0200 (EET) Received: from localhost.localdomain (unknown [124.16.138.126]) by APP-01 (Coremail) with SMTP id qwCowADnLscyeQtiT8vZAA--.63069S2; Tue, 15 Feb 2022 17:58:11 +0800 (CST) From: Jiasheng Jiang To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Feb 2022 17:58:08 +0800 Message-Id: <20220215095808.1672019-1-jiasheng@iscas.ac.cn> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CM-TRANSID: qwCowADnLscyeQtiT8vZAA--.63069S2 X-Coremail-Antispam: 1UD129KBjvdXoWrurWfXF45tF1xKw4rtryxXwb_yoWfCrb_AF 97Cr1DXa98AFySqa17Gw4Ykry0939xZF4rKFn8try3GrZrZF15Xw17X395tw4kW39rZr9x Grn3GrWxJwnrKjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbwAFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8w A2z4x0Y4vE2Ix0cI8IcVAFwI0_Gr0_Xr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr0_ Cr1l84ACjcxK6I8E87Iv67AKxVWxJr0_GcWl84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s 0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xII jxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr 1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7MxAIw28IcxkI7VAKI48J MxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwV AFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUXVWUAwCIc40Y0x0EwIxGrwCI42IY6xIIjxv2 0xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4 v20xvaj40_WFyUJVCq3wCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E 14v26r1j6r4UYxBIdaVFxhVjvjDU0xZFpf9x0JUywZ7UUUUU= X-Originating-IP: [124.16.138.126] X-CM-SenderInfo: pmld2xxhqjqxpvfd2hldfou0/ Subject: [FFmpeg-devel] [PATCH] avcodec/vp3: Add missing 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: HZcX9IZNfHmQ Since the av_malloc() may fail and return NULL pointer, it is needed that the 's->edge_emu_buffer' should be checked whether the new allocation is success. Fixes: d14723861b ("VP3: fix decoding of videos with stride > 2048") Signed-off-by: Jiasheng Jiang --- libavcodec/vp3.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index e9ab54d736..e2418eb6fa 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -2679,8 +2679,13 @@ static int vp3_decode_frame(AVCodecContext *avctx, AV_GET_BUFFER_FLAG_REF)) < 0) goto error; - if (!s->edge_emu_buffer) + if (!s->edge_emu_buffer) { s->edge_emu_buffer = av_malloc(9 * FFABS(s->current_frame.f->linesize[0])); + if (!s->edge_emu_buffer) { + ret = AVERROR(ENOMEM); + goto error; + } + } if (s->keyframe) { if (!s->theora) {