From patchwork Wed Dec 15 02:47:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yy X-Patchwork-Id: 32510 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp7779907iog; Tue, 14 Dec 2021 18:47:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJzqo4fJ6dAci6yXhGvU0aVxJneb62bP9xj+iiZGysvazSjyEq0PJUk1ErMbaa2w5H8xOVhl X-Received: by 2002:a05:6402:796:: with SMTP id d22mr5596263edy.381.1639536475140; Tue, 14 Dec 2021 18:47:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639536475; cv=none; d=google.com; s=arc-20160816; b=OxHy6OfEEEHXcA+AudYIczgGoZ6yUnP+f4mWZdK0jBIHOoWTEGRNZRpG/CTy14ewk0 r4rauIJDzeb2xlQQWSUAvdPIT3TvIiHKIlujI2rksBEjX+vf+PTZBHktrVhIUkU3hxvJ AHupjEzkK81qeVxWqeAfOsH/Ef+9P5JPYGhZGwRzUiSYzDH7vEqTRUYbpogURyc56ub+ RyXEKeIing2TA02zw8o2iOiVXECijRBkVb3Q7XwdroZU3ZHxZYscENS3VvX5zGaxo1pG /Ywd3+ViBsiusfeoy+7b5f2ZNTCMrhpvuSh047TazC3oD1kZSRc474DuUfYNTqjHqboH OPCQ== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=47Xy/Wn6Kgr9Kq8WAxNnHwHq2TFxtE/X1T9BTEqLVBY=; b=kioUwATFOioMxMsoo2zossD9lHlaeieWTFl+75rXG9lGiIVsQH5Ct38VaIU8SrUv4V QlmkCUeAVTxKquIbyLpjkpllLiIKIqf013X1MncGB1YRlyivC2URFkmCRWa5v38pJQxl dcYpPEs8ui9edMNBRSNsC7gcjEpKqbn6KZalokCmvAlor6QzbusmzEiQ0hBEwFhZiTP4 atbJbCxXjK3dkiaAxI0rPV3EKuvoR/H8k6c7dvm25ChlFwr+Anwn6n91NpU1EIe3LPZ6 8ml1+XN9GFVBOJouj3tZcjQJyk8TZHniW1HUbvsovOnBR+7a3+BwyrQE1K118+mmJnpz yGtg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@163.com header.s=s110527 header.b="F4Hi0/Fa"; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=163.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x6si539610edd.168.2021.12.14.18.47.54; Tue, 14 Dec 2021 18:47:55 -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; dkim=neutral (body hash did not verify) header.i=@163.com header.s=s110527 header.b="F4Hi0/Fa"; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=163.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9CEC368AFD9; Wed, 15 Dec 2021 04:47:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from m12-12.163.com (m12-12.163.com [220.181.12.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CCE5268A58D for ; Wed, 15 Dec 2021 04:47:43 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=uBuLb djtoqcWTjrSOECl9K1O3X7qvKfrgJ9saG6g7wk=; b=F4Hi0/FayltxC2JjXf4ll fuK1pOpDNpVudMPi/FRM/8+83uWeb7iP6FyUE32ASvyEow9fm8r6NEUJSn5/Jbe6 Adz4MGT1/DWYFQ4uDiLPJBNRQf5HqFz55Rfvp/TjhVq/70WfSWwovVC4CA15jix2 KjV5Ptc3IxPMFteyQuLO1c= Received: from localhost.localdomain (unknown [103.107.216.232]) by smtp8 (Coremail) with SMTP id DMCowACXxytNV7lhGwhlCQ--.42466S2; Wed, 15 Dec 2021 10:47:42 +0800 (CST) From: Yu Yang To: ffmpeg-devel@ffmpeg.org Date: Wed, 15 Dec 2021 10:47:28 +0800 Message-Id: <20211215024728.85590-1-young_chelsea@163.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211206122142.84235-1-young_chelsea@163.com> References: <20211206122142.84235-1-young_chelsea@163.com> MIME-Version: 1.0 X-CM-TRANSID: DMCowACXxytNV7lhGwhlCQ--.42466S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7Zr1xCr4rGry7Cw1fCFy3Jwb_yoW8XF4xpr 4rAry3tFy3XasxAF4kJ3WrCa4rKrWxX34jkr4Fvr1UZw18Jr1vkFy0q3WFyrnrXay7Wry2 vrnYgr1qy3ZrZFJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07U6CJdUUUUU= X-Originating-IP: [103.107.216.232] X-CM-SenderInfo: x1rx0wpbfkvzxvhdqiywtou0bp/1tbiNBhqSlaD+5568AABs3 Subject: [FFmpeg-devel] [PATCH v5] fftools/cmdutils: Avoid crash when opts could not be allocated 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: TOTE Robot , Yu Yang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 4dq4dMOq+sZ3 From: Yu Yang If 'opts' could not be allocated, exiting the program to avoid crash when release it. Reported-by: TOTE Robot Signed-off-by: Yu Yang --- fftools/cmdutils.c | 2 +- fftools/cmdutils.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 3c8e5a82cd..882584e9c2 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -2187,7 +2187,7 @@ AVDictionary **setup_find_stream_info_opts(AVFormatContext *s, if (!opts) { av_log(NULL, AV_LOG_ERROR, "Could not alloc memory for stream options.\n"); - return NULL; + exit_program(1); } for (i = 0; i < s->nb_streams; i++) opts[i] = filter_codec_opts(codec_opts, s->streams[i]->codecpar->codec_id, diff --git a/fftools/cmdutils.h b/fftools/cmdutils.h index 82cda208be..50eed9b13a 100644 --- a/fftools/cmdutils.h +++ b/fftools/cmdutils.h @@ -430,8 +430,8 @@ AVDictionary *filter_codec_opts(AVDictionary *opts, enum AVCodecID codec_id, * Each dictionary will contain the options from codec_opts which can * be applied to the corresponding stream codec context. * - * @return pointer to the created array of dictionaries, NULL if it - * cannot be created + * @return pointer to the created array of dictionaries. + * Calls exit() on failure. */ AVDictionary **setup_find_stream_info_opts(AVFormatContext *s, AVDictionary *codec_opts);