From patchwork Wed Feb 16 07:05:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiasheng Jiang X-Patchwork-Id: 34332 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:90eb:0:0:0:0 with SMTP id a11csp983511nkf; Tue, 15 Feb 2022 23:05:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJxtr6yPb55DaE+RWDCx6zkNJG7Pfs8YORExfOnjfb5HtF5v20n2O3JadTD8nAAMlhV+/kZv X-Received: by 2002:a05:6402:3694:b0:3ff:bac:e527 with SMTP id ej20-20020a056402369400b003ff0bace527mr1524153edb.306.1644995128628; Tue, 15 Feb 2022 23:05:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644995128; cv=none; d=google.com; s=arc-20160816; b=X29OvsHilJx929VQ6ecqoGpk13V80Nb/uKiqM0HpwO5UQKAqGh8zV4ydA4sMR8JAZx 6zKYB5ceMTk8Sr6hCd6X01Nt5Kr+Zz2N6KfOmiMi09CFP/v2F91f08VQowI71d1BAaN3 wZqDekjlcTf7rprxbmQANcay4Z0eLssu7MSID6IVDhqswbYh4GJ7tUqOYwlnDLusxBcG t08SBQlwNe73qsvpXvpd5VY3E0mWOcmg/te+dBy0zdeR+I6g5Wf8aw6SNc2otayMUfBG X8dIEAsR6GAz4VfxaO36CMAfWf1bMRM7V6SPsge/mCQ7ApjE0pzCzvV5Nj9jwxWBh79u CKtw== 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=SC/+SZ0iZcoup2EgcwZRUdCvbAaUJ/HyFiZ7gVdmXqc=; b=ET4mBH0yX90qu6t2ckHySdhGL4xG0LAjZt/W+xbhgQk8TZ726f1BABg8IW5nv/vnHs 0oZTA0Us+sSFuyDfp7rANp8vQD4YgdMB03k8V+ENgo+gdOl+R5ebP08tS95NWIydXUUI 4mRfn0qDz5dhMey3SDluJvR02GJKrsE37ws/6jAkq5YLQeGQxpK2rJoXsroxts+u6Qw1 tAYZGpSoUfep6ElEJnneMO/1PweWmqx+zZVW1DtOJS8L8pzOenC0bvtVEkdjy5X0Wwf/ PZLh0zEui+cZ44kV8EAyEWi6P1PnSSmmVxgqEEGyV/qGr+ogzKSjBFr2t0YWaL1li4SW TBpQ== 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 c13si23466948ejj.7.2022.02.15.23.05.27; Tue, 15 Feb 2022 23:05:28 -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 2A19168B237; Wed, 16 Feb 2022 09:05:23 +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 AFF6968B172 for ; Wed, 16 Feb 2022 09:05:15 +0200 (EET) Received: from localhost.localdomain (unknown [124.16.138.126]) by APP-03 (Coremail) with SMTP id rQCowAD3_cElogxis0usAA--.4481S2; Wed, 16 Feb 2022 15:05:10 +0800 (CST) From: Jiasheng Jiang To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Feb 2022 15:05:06 +0800 Message-Id: <20220216070506.1834664-1-jiasheng@iscas.ac.cn> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CM-TRANSID: rQCowAD3_cElogxis0usAA--.4481S2 X-Coremail-Antispam: 1UD129KBjvdXoWrKFyxGw4xWw1rKr1xCw1fXrb_yoWfGrg_tF nFv3ykXayqvFsFvw15tr98WF48Z3y0yr4Igr1fJrn7Gas5Xry8Ars7Wr45Jw4fWFWYqry7 CrWjyrW7Jw129jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbzxFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8w A2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr0_ Cr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVCY1x0267AKxVWxJr 0_GcWle2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E 2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJV W8JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I648v4I1l42xK82IYc2Ij64vI r41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8Gjc xK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1Y6r17MIIYrxkI7VAKI48JMIIF0xvE2Ix0 cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE42xK8V AvwI8IcIk0rVWrZr1j6s0DMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7Cj xVAFwI0_Jr0_GrUvcSsGvfC2KfnxnUUI43ZEXa7VUbrMaUUUUUU== X-Originating-IP: [124.16.138.126] X-CM-SenderInfo: pmld2xxhqjqxpvfd2hldfou0/ Subject: [FFmpeg-devel] [PATCH] avformat/nutdec: Add check for avformat_new_stream 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: Ab5xQMSxxzJh As the potential failure of the memory allocation, the avformat_new_stream() could return NULL pointer. Therefore, it should be better to check it and return error if fails. Fixes: 84ad31ff18 ("lavf: replace av_new_stream->avformat_new_stream part II.") Signed-off-by: Jiasheng Jiang --- libavformat/nutdec.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index 0a8a700acf..eb2ba4840a 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -352,7 +352,11 @@ static int decode_main_header(NUTContext *nut) goto fail; } for (i = 0; i < stream_count; i++) - avformat_new_stream(s, NULL); + if (!avformat_new_stream(s, NULL)) { + av_free(nut->stream); + ret = AVERROR(ENOMEM); + goto fail; + } return 0; fail: