From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 15D6542109 for ; Thu, 16 Dec 2021 11:11:56 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3264E68AE33; Thu, 16 Dec 2021 13:11:55 +0200 (EET) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064069.outbound.protection.outlook.com [40.92.64.69]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1101A68A3DF for ; Thu, 16 Dec 2021 13:11:48 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kGEbdyXX+2QpGsyySLxJHedMwulu3F99BvNaBmrNNPE+qD/zNqYB01P2rIHiLtn75ajuUpEt3N2pkMKCpYqjFoiDoVwyrYI1mTlLwG8WaFhMXPA6cOHOElwm77sMv8SvTWiULnVakqOOqLfwByBfJ9j65/7SfMq/PVnj02S7zp4d/tL4DQvJgQ7o2S38/QQID2+m10HORojTae3LsaALL+5P1/bb9Gs0bi4Yua/NQvuCm7Df8HkztOMXzUjSJvC3f/14zkpajLV8MylUbMHfCjK/boabEDZ2TSiq0eNjoiAEFApYARIOcVtgwKPri6LqYpKO//gR8DLyK747vVKF3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=pUEkup47fheIU1NMy0n05Pdsiq7yoXUAvVaYKWw63ag=; b=bKwhf3vaR+rfd5CVbPvRRijFW586KOypkWgA5UaFjYVoyM607KWaca5jpXoNC9nhYLbwGqfDrMNmRxlHn5mNfL5nwSD/17pwdHeQZamGPbHlMbGyix4/X7N5cPz+VVr1kJxIHmtn7sAJTyz4vs5IAC1PgTEZlUIaK8946bFRJTRFP/iiADI6A8IDbOHq3SUV1l7gwWmb0l6F9TZb29pZmh+IAryUpn//bteV4GXa555lpI2G/HIl9M6gk2n6GSnQRidHaS4LNcqi34S29VC0qxCTWc+x85Xope9UimlV7beLto4l0fDDQBGz17UnS02zAGJ/2msOECB56z17inJvrw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pUEkup47fheIU1NMy0n05Pdsiq7yoXUAvVaYKWw63ag=; b=oRAOvARhS3uC5smDFkseZCju82N0CIY2rBEo45m3R7N1mfr/yyWBfk537JSP2BYWEPm9a8sA2iN4ZNn1f1C9u/jRL8g/O3Zm9EIFNsIiBlpYi8PV8SfNc4zeYzFF1wW/mNZyk1Gz5o6J1rFzBrAOJ7I2OS6wZYsMLHlIxw/l9jarQs9knypFi3vzAMu2KKpS2eRV8Ad62U+GB7tFmu0Y4PHlfNptgyc/k20LQFlTVQu2wsL+am/liOpmNY2EI4kHvXTPb0OKKI9TT6q0g3gE7rJKStHV0ShAxRGKcNsljUuZ4CxHyOp+ynnGFqwj0QSyOWzXSNtVN348QveSc9H7ow== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4103.eurprd03.prod.outlook.com (2603:10a6:20b:22::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.12; Thu, 16 Dec 2021 11:11:46 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%6]) with mapi id 15.20.4778.018; Thu, 16 Dec 2021 11:11:46 +0000 Message-ID: Date: Thu, 16 Dec 2021 12:11:44 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20211206122142.84235-1-young_chelsea@163.com> <20211215024728.85590-1-young_chelsea@163.com> From: Andreas Rheinhardt In-Reply-To: <20211215024728.85590-1-young_chelsea@163.com> X-TMN: [ZiJ4aXzRDY6AgHSt5Pi4Zy4DZUe3PrTR] X-ClientProxiedBy: FR3P281CA0080.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1f::15) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <9671dc63-979d-8c6a-83f7-004e8f780ade@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8c10cb86-2b61-4b1a-c9dd-08d9c084d948 X-MS-TrafficTypeDiagnostic: AM6PR03MB4103:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TcuIkQnoVm2lPC8+hdL6xZxG+cJ3GOJitjSxBen+tQ5lxAhxMYaKKybLypLZXx2iDhOLIbbpfXoD7N92vS9y3o3OL+VI9QAP9QbSbi+trXp7LWHk6qc2lRpD+V5tWN/g/SrRAtHm6tvqcpNNehRhmW6G7s+YoE/5y3NZFQ5ZKcgKFEPFuzYk8RBVasoznNRgMqTYT6KsUA3/KmyTQIr9CEwZFU7chmsxK96Urqvnd2ZLGPGopUKukNcmfQ2PSAPzSmzexF9klp4X+NOgTtBtXK0Z16YhZYt4g1L++wbQjwlIUXTYEEQ75YUHfPyk1vKQw7lUYFJxr4oT6U4T6HoSdJnAKjP1NETwlx5x76trcXQTpdzDtHyO+unGVaKrnLTfKHn9pCnl7e1yXd1BXI/KYegrx80WQ8Mw1xoIUiZ9jHrI5V3KYS1QxLjYgPr+OKEtzwVi8qhb7MZdI+E/XJN1KVVUpPXO9Zns46afke7VYCgbDJubnve89AWjxvOhpU7tXBtp9WMxWtiBoBeKlNFoW3LliLNYEM+owXT2wWTrlMMJmUrGPd8vcq4e/I6d1NJ1+3a5PY7mmup7VMidTIDu8Q== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?UHZ4YVVld0NXc05rM1Y0UVdsdUhPVGZNUUFCM3ZDVnVqcWZnVTRkVCtCWnlw?= =?utf-8?B?RDc1YkNMZ0NmSDZJMlVVUXczZHBwNVp5d28rVTVZVUtTUUx2VXllY08yRVlv?= =?utf-8?B?Ukc0YTNxSW1ES0dLNTI4Mmc4VWpQTkE0cTFHUG9RblJ3Q2lUWVp1QnBFNFUw?= =?utf-8?B?QlZKZnloaDU2cnBvcG1qcWtBL0VRSVRPQ2h3MGtjR0c5Z3o0dTdBSlE3WWFy?= =?utf-8?B?Zll2TWpQME1EK3RoYVByd2VOOEFjQ3FDbnQvMGo3K0lxclNBdGFsaVpoWmJI?= =?utf-8?B?UGpReEVBcHdlNHVJSHQ0Ym52b3hXa2VhSTdvbngyUTQ1YzhremxkT0tJMWpX?= =?utf-8?B?eTBWQUdOQWZvbFlaampkTE9nYWxKUUsyekdqdXdEdUtFZ1Rqb21hbU5qcHJx?= =?utf-8?B?VkF0MTJyQVI2M1c4VGFHVmE0a0RrWWhwanBidmpJam5sQTA5czU4eEVlQ1Mv?= =?utf-8?B?a3BUbk1VU0NjeGJENzhKTHl4THM0ZitZRWFQMzFVcFd5MUtXVDc0STRDSHNQ?= =?utf-8?B?bE9WV01BMFhIbmtNUlJub2Y4RGtqeW9EdTBkR1FqZjQ4YUhQa2U1K2J2S3dC?= =?utf-8?B?ZzNHZytSeVdMR0gxVFVPMHZvTkdzeGEzYTRKTnlrY0IyR3BmLzBWUzRrckNh?= =?utf-8?B?L2NZSk9LRWIvWURCREpSU3hvbUI1Vm8wZlNtSFdIMkNjNXZ6a0JsUmpvUk5o?= =?utf-8?B?NUFNY1N5NXE5amxzWGFteTI4Y0VvNE5tdFhnQXNmWUlxSDYyTTZ3RnVualF6?= =?utf-8?B?K3lZNUhDeTduK2VhV1hESTVPRWVPV1hlbnNKTS8vOHl3eXJjaStsVzBKWGFV?= =?utf-8?B?Y015ZUJCQUhlcHlYUTZKNm03QzhPcmt4cXZJdEs4TmtySCs1ckMwcXQwQjln?= =?utf-8?B?ZHhaOWZlcGZUOXdKcFd1S1RNSGFXL2IxMkY3MkRDRDRndHg4QzBsMGJ3RWl3?= =?utf-8?B?aDBJMjMxL2ZyY2cwcStOU3g2VlF1V08xbmNHOSsrcmdQQmhCdkVsU2laanV2?= =?utf-8?B?WmpPU0x3WEdFZEIzd2tsa1crY0FUTURyY3NpdlB4RkRDQm9LWEQxUVZZMjIz?= =?utf-8?B?T3dSZHExaFJORGlmeHlkN3NGeXVkNFBtY2lHUkVEZzhJcTd0TmY2U2lrZlpT?= =?utf-8?B?cVJ1M3RQR25CZkcrV1RaclZJMWxMWjFVY1J2Mm1NbFdnRlZzVk0rckNJL1hs?= =?utf-8?B?M0o2WmxRaXpUTGx1ZG9SSDhDekZrTE1IN1I5UWg2SEVySGVKUm91TkNZS0hx?= =?utf-8?B?Q2ZDRGNobkdUOURZS1BwdjluRGRGd0YwUE04Q2xuOWRIRm1rQT09?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8c10cb86-2b61-4b1a-c9dd-08d9c084d948 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Dec 2021 11:11:46.7808 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR03MB4103 Subject: Re: [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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Yu Yang: > 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); > Applied. Thanks. - Andreas _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".