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 25B1F4AA8B for ; Tue, 11 Jun 2024 06:38:55 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9464068D7B4; Tue, 11 Jun 2024 09:38:54 +0300 (EEST) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2107.outbound.protection.outlook.com [40.92.75.107]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F24F868D6C8 for ; Tue, 11 Jun 2024 09:38:46 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m67xliU6B7846UTuRu8pm7wXebsRRyRo1jRo9Nkbw4l0lMqI0Q525rPOcAgX7WHBsyb5caYDKOVjcgnt2JbBMyVmEpSqYpKdPyLCgxPi3tHmazrhW0TlU7tYc67Z/mNbukLc0AsvK9DCB67XqlwV4k1swOAeufxAM7QEz8zKm94+Q+jDEKVSnlq70XvHH7cnQH2fu9QuFF86YJgz2gSUmsos/Fjhj9vQDJjhrrkjpEtjdT2srJSpWxuLwb2uCiS6pucetwRfFoOsO0lEw9IKgL51tHtSPiJUa/sipCyMqmjwihdRAibKSufpdFBea+qwBHfeTBC7dWAiBDH248Njag== 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=4j/tvbLKdTTsP0CSVzWs5xqZbYI10QcyJyr86khPN+M=; b=JI4XEE6ciGiqa+MBTuO92Ktct8Ek2BsqD/9TLVVDeUIsO/M3CCr/8XjZJh3ekFqNjLnRc64huWiv905h77uSMZgvb2Iw/VsDseMnDjxtt2TPY8jIDHCQzJedxQLd7s1THu/Cc37v7X/Fngit5h9mnNBtAv8gtj50dj1s/eohsqHRKWHySnSOgyU/j+E3g4DpCMDnukXe5YLVPj1fOpVdCUvacdPqHxQ4EiFgYNVG0r/MMwmIFMVHpGScNB2zLngTuo/a/83CGpJilNpO523dBWfZ0dIIcGdTulBmaSpPRH5ULzYhoqPzMBGDnNZ+dfZNkvPrrte3Lm/Yzky/kOeEAw== 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=4j/tvbLKdTTsP0CSVzWs5xqZbYI10QcyJyr86khPN+M=; b=SBANF5pU5BvA7580xJjRE2pnJm5XUvdOzN0Fo9UZkkJ515M5bUwTZVDVGxEdGKmdNhQ6hylFpdd8J2U7Hz5WYLFeOERa5OQIQkmB/GuzNUrxoeZTIql8LGCq7ypNmPJMhvRjuZ9TzhYtG4SJBaVLV/VWhRBNJNRfp+RZLtFTtY9DB1H+yvllfmIYGfsNS6ZaHhKZKIKxJ2jZ9ybrD7KjyB3Wv7Ulo4kN3cx8SKyqnhNNsZtPXNxptwfIf6PqXPwibEgxsrTkRpunL8BF9xgc8pYrT5vl4gkAsGIVz+g/xd6CUuth7zT0xxS8XmA2R+EGNZhVnlXmhVn+7nPVRZU2aQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0276.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17f::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.36; Tue, 11 Jun 2024 06:38:44 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%3]) with mapi id 15.20.7633.036; Tue, 11 Jun 2024 06:38:44 +0000 Message-ID: Date: Tue, 11 Jun 2024 08:38:40 +0200 User-Agent: Mozilla Thunderbird To: FFmpeg development discussions and patches References: <171808414916.28895.5972303409307279598@lain.khirnov.net> Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: <171808414916.28895.5972303409307279598@lain.khirnov.net> X-TMN: [A+nAI+g2P5fMjE0aLSBVND5cJT52fPvDYabSN3MXDcY=] X-ClientProxiedBy: FR4P281CA0418.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:d0::13) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <07180677-d780-4ded-b527-a73bc4dd73aa@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0276:EE_ X-MS-Office365-Filtering-Correlation-Id: 6770fa5c-1119-4b57-c23d-08dc89e12410 X-Microsoft-Antispam: BCL:0;ARA:14566002|461199019|440099019|3412199016; X-Microsoft-Antispam-Message-Info: gAIr5NfaTw/zvLRfGOZx85VmCI364j6I5CkbFsFWW8Vucv0rgSYsabJZOq76haxPgdF40kKkVaeWhCs1sj6DeHAX4mujhRirxHWTV7rrdl1u27xDtqfVcR5Y/MOcrrSweKWT8F0TvRoba+XTRxO/JahnJi8haZu2GXEWkX6F/KrBVtJ/feqAJRUh9/JdNGICg7PL+S7bJPGs8LZx25fWXC2fHfSO0bWMhKuW9xGxlpUntLOZI+ofhk8tMGPhE/cPXhqQZVRSrRqBhFmqVvtPnEG6BkTgueKvNML6pfuEvGp3iD5IU+qv4A8p2bwYJ4Eq2ngmKkhoK19BsH027oQ/hBwHDN7rHGSeVvn/Vo3a9AOd/ffTI5ICn8PiKcq/KiDQc+1LRVvg+2FPs2nHJJdG7PvfV9WFT4ALPX6G4GWZzFc+PILPGEUCswbeNtzfRIY7JPeabx/A1jc3Ma6OOdQZufhD6jfv95jmVRFFVobl3f7uXsxkY5oQxtw9X1S+JTdUTU78QseS0iYRyXhsYWPOsw4IF3sGDAkLdWvdy29XTrCGL50SG7xRoDKFDYucyqdE X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?K1Q0cE9DSnZoZkN6NE5EVkdpTmh2VWYzSXVhUnczWi8wQmoxYytSdWxqRWFW?= =?utf-8?B?dTByZm1vWC8xbmR3UkZNUDQvM3lVZzhwSlYyWStyWDlYKytvS3IwckhEcUFj?= =?utf-8?B?QUc5cDdqMlhPMndkYVpVb0NVWXN3dVJWNlZYYWdXQUI4YnJIRVVLVDg3TEFV?= =?utf-8?B?b0ZKaitYWGMzbVg5MExHcmJtS0UrWXlRTzVMNW1VdjJVRzNrb25HSWlhUEVz?= =?utf-8?B?REluaU53N1FPajd0QU1qRFVDYVUyNzJwVDI1NHg2Y0xqQzVzOVBBajRxdnZ5?= =?utf-8?B?QmVqVjhNeXd0cWx3OWg5MDRIL1hTQ0FQemxZYWJGaDJUSk9CMDQvZ1kvZENh?= =?utf-8?B?VnZYeFBSQ0lvMjduT0dYL29xeHNycnpGUS9GS0o0UVZhMmFyL2pHZXpzMXBS?= =?utf-8?B?RmIzamJiSlpKcWVueGgvMUt5a1RmR1hKNWY2RkxPMERVQXdwZzk5YnhPdzU5?= =?utf-8?B?UWQ5M295ZXZ0Zjd3Q1ZEQWtyeTFKaGVPM09XRjFnUmZwbzJvRmdsZjFVd2xh?= =?utf-8?B?Z0w0U3BqWnJ4NTJ2eTgwSWNMOXYyTERnd2l4UCtDclRDa25HSXh1dWhrV04r?= =?utf-8?B?dVBFUnB2QmttTmlWY0wxbjZUeFpqUFVqRDh0UEhZNFV2WllySjMvaFF5Lzhq?= =?utf-8?B?MEVQL1JhaXlIb2x6Q2pLUmY1QmJYR2RidFZlYlZNbkNmbUJscFBJS3czN0RG?= =?utf-8?B?MWduRmtkN0IxWk5UajFRcEkvMW5oclBpRzlyeVFsKzdXWnp3b2lucFY0RlY3?= =?utf-8?B?cFJ0QXZLd25pOWN2Q0ZWRUpjakcrbWF1WHp2WGxTV3FLWlJlcC9FSWVTMjBv?= =?utf-8?B?MWZmSFcrNVhaKyt1VkFKQTRUNWxpQ2Ntc3dDSndVdFFnMEZHSXZYZnFkUUQ2?= =?utf-8?B?enlqcTZJbVAyc2Y2TDlNdkNFUDdxZUJIM2xYYUF4VkRxaU5lbnFCbUc1QW5Q?= =?utf-8?B?d0ZZVUF0VTVnc3QrUzZEOHp1QTFvTUFSSTNZYVJaS0JkMDFXQXYxMUhpdWkz?= =?utf-8?B?QmxZdm9CZDhmeVZKbHhnYmRtc2FpMUh6aGpsMEdJcTBtUHg1OEdDOVdUUUc0?= =?utf-8?B?T0h1SzVRU2pGRHdJajFpYTZYRzQ5YXczOEREcExRaFh3NUZpMnluVDlUenFv?= =?utf-8?B?TEVrK0tqQnlOeVZ0UTg0L1RjUXZYRHIzNHZjMTBiNmc2dW1yT2tFTjd2L09r?= =?utf-8?B?V0N5ZnRBZE9HbTE4TlRDRXJEZjBGS1JYN2VLZklEVlRLdzdKVnpnanZ1OUFs?= =?utf-8?B?R0pLanprQXVYSm1EbzNWVTBoem5KRHRHTUlSSU03aWFjUDZrNk5XRzk3S2dQ?= =?utf-8?B?YmlKTi9oZTRjZVV0djgzbHl3UWxORHFRL2JtZmd1ZjRnQnh3aUMxS3cvdXF1?= =?utf-8?B?ZkFHeTZKWmtHcXhPU0IwbEwzZ1FSQ2lhZTBuL0JMcTdBODhDSHdKMFNqRDlE?= =?utf-8?B?NGJOTWowYzNvSjVqN09vZVJSYWdKNzFYbjdjRXJldW15NDlxc0Z2amRsOEI5?= =?utf-8?B?Q2p1dTdSRmxVa0VNSytRY1pnY2J0b29lWFRGNklSRmJrckhidkJ3VVZZdytQ?= =?utf-8?B?VmlFMWZlSFY1ajVPdWNNU0ovT1doZEZPUmZSWHV6cC93QUEwZkY0TFR1UWps?= =?utf-8?B?K2s4NzBQcFlFTHFGVVQ5Y2hDczJWa1dKeEs0bW5teGV5YzlMMllBd014Y0Va?= =?utf-8?B?WWRVT1orR1hsZ2JBRlM3bVpqaFd3VXVoVW1EZlAyRkhBVXh6NnJ2MUFRPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6770fa5c-1119-4b57-c23d-08dc89e12410 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2024 06:38:44.8085 (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: PR3P250MB0276 Subject: Re: [FFmpeg-devel] [PATCH] fftools/ffmpeg_mux_init: Return error upon error 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: Anton Khirnov: > Quoting Andreas Rheinhardt (2024-06-10 15:24:49) >> Currently it may return an uninitialized value. >> Introduced in 840f2bc18eddd72fa886aec30efc82991b920c45. >> Fixes Coverity issue #1603565. >> >> Signed-off-by: Andreas Rheinhardt >> --- >> fftools/ffmpeg_mux_init.c | 9 ++++++--- >> 1 file changed, 6 insertions(+), 3 deletions(-) >> >> diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c >> index b1cb6cf7bd..1953655135 100644 >> --- a/fftools/ffmpeg_mux_init.c >> +++ b/fftools/ffmpeg_mux_init.c >> @@ -3022,10 +3022,13 @@ static int parse_forced_key_frames(void *log, KeyframeForceCtx *kf, >> unsigned int nb_ch = mux->fc->nb_chapters; >> int j; >> >> - if (nb_ch > INT_MAX - size || >> - !(pts = av_realloc_f(pts, size += nb_ch - 1, >> - sizeof(*pts)))) >> + if (nb_ch > INT_MAX - size) { >> + ret = AVERROR(ERANGE); >> goto fail; >> + } >> + pts = av_realloc_f(pts, size += nb_ch - 1, sizeof(*pts)); >> + if (!pts) >> + return AVERROR(ENOMEM); > > Looks good. > > Would look even better with the size increment outside of the > av_realloc_f() call. > Apply with that change. - 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".