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 755614AA95 for ; Tue, 11 Jun 2024 06:40:30 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1823568D7B2; Tue, 11 Jun 2024 09:40:29 +0300 (EEST) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01olkn2080.outbound.protection.outlook.com [40.92.64.80]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D837068D6C5 for ; Tue, 11 Jun 2024 09:40:21 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AW7Xh6qgSoqOTQ0zVXP1vMri4iCmxKPjzHqWxSUbN4XD+E4ZLV6siiDKVpoATzh4xYDsIzeXCk6eg5v3OUVCZ/znBtd8VBACrkUrzn/+6MhtQA79UIXhD1KrZuSPwyMBmdfXNlGIAcaAisCLNANJMx0GzyQ/EdbYVoL8v49O5yv8FqvjKH990xekWheBINRhLYy0SV9apcci6N9tZFKp8CGabl1CAD4wmoemGmRZOtv09OBc8lxwkFu9JQZ3oeZpmPtXkGpuNdLSLX6dd0rtdv6iJfRiXCvgARSTwIr1MqdMMnRMMIW0Ki/JTFQF/HCdpTAIvVWXDQZw97G7mPyn6Q== 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=NXiJas+a5ch+o5iagNzQ1JN7R06h7hnetiyS4JNC8ts=; b=h4aD3AaXtAT1JILOZK4T9WMT5zHwCp7ClcDxbsSPDlzZUGOpX7Xjs24vGEwpwevPGhci+xIF+6ZTsyvReWxJo35oaO/I/b88AT3iZDHvEDkEvpniZ7g6TPLjPK+/3Z2mo1kXV/J5jU+3oqBpP0J1/oRKvuTgK+VDIHcDsW1UV0WmluR0vIVbb+rjYWM55v3lybV+pPNezI6a7azO/jEMVJNeNxOzrZxPYUlh98SEl9Rv1LYnDlXtzJaxXJeeeGR2akWc2SBqp2v/S07x08a+kv2T1Va38awDjsP9rAp4TWADNC3uFSHzrHdd1vNeOhSOBM/t14lpLKO3HaSOYB6LxA== 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=NXiJas+a5ch+o5iagNzQ1JN7R06h7hnetiyS4JNC8ts=; b=kFpoVPt2f2JJ2zd7Y5EUL62gILFXBL2jNt7GKLCuTrAFEPu/k8u2SzdTiOG7T7RgehaNAHf0ivfayLdUVOY9id5CgHSlGLGcy4c9vy5eE+8FQynBgXgTtcExmTkiRgNUpgv3XQu+LCp2pXysCX9olV2Lw6FhjhjKKdHTHS7zUPBI2z4bDlhAxTam3KXHYvzHgt+in6Djyrmmx1tb+lYIgj/eMhZq9P5YT4svC2KMt5UnlmpMdRGm+Oc4BDVPdNbgK/neYUx9sk0OcquCyUqQESahhVY5y+z8RP7OEwa0GTQFiJHEMS36KKbxeAL+u6aPpkpCqAM34cYj0YyjdDr21w== 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:40:16 +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:40:20 +0000 Message-ID: Date: Tue, 11 Jun 2024 08:40:18 +0200 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <171808414916.28895.5972303409307279598@lain.khirnov.net> Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: X-TMN: [eBoNNwHF5bNY/R8WKrYH7sxTGHSxeGT6MzIonFJzmFk=] X-ClientProxiedBy: FR4P281CA0417.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:d0::8) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: 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: 53002e2b-e5db-46ca-9aed-08dc89e15cf3 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|1602099003|56899024|440099019|3412199016; X-Microsoft-Antispam-Message-Info: pnH7xZpIeR3du804yW0X6v6mbhP04OEaXuDSxhXgZqOuPQfyNZckfoQQmYVNP8plpcfXMV+hQfK7aW+rQeaq+5/S6+77FdxgDxVz1IfmYvhviX/wgt8G7YF3D7mzqbt59z+aTWoY+pEZVywkJUdkFPfv/85u7qTFUJgo5vgQ7fY/ABdAlFrd199CIgTRM+nxCS/H8e2mvtRscrIDYdH7DH7lDYjrfcbfycqZfYwqJ0rhPIHmRdldmW9yd6aZfDmyE3nfzXeEymzA/NFwkdF2bkZCzsn42XHSoGcohJu4oio8U3qT6qzTkRZm1cAClfI6IOAEl2KJ/LAY6yae8Re+ITiFAZ2CbHPru6K9BFXqCVgO6uBp+4sIe3TOKZau0jvpeoV5aXIM00F3M2xfic30/Ki3m2du7rvxiiX9wDwL1BmB/8mVlbG25tMWU++bSLvMcND7GMaVoPlz6Hl8Nbg91icNEckzFZ6Y/L0wnsyMa4OeDaO4+utzQ+XIzU3irlZxewDKHEDRFE3gybAcS2KABHpR8cdrD6j5e8EBjm9M5+PZnddxaZ2uX2GzjuYkbAUj4F8rUpQvJDPuNTKrtIveTE0TRmn3Tch3d6VNUnHUJRsqhMrDM2HyzkcLXhJIU2t4itpRkqeEYC3e+G0+6G1BE8zzmOVR5lpIfPKYe5jsPuQArw8jlJ2V87JNXH/4XW44UIugfF1W9nkZ17rpCV1dxg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?eEFVZUlzWTd5L2VuZHV0d2hvRXVmQVM4UVN4WEhpMXBqK041OXpzOTZTSUM1?= =?utf-8?B?YkFjLzErRm1wSDJ1VERFb0xlem1MUklHOEI2eVBJMEQ3UThRK0JNTEs0ZG1T?= =?utf-8?B?QmZjcC9sOWhFZTJ2YVhFbnJ0ZE9UZEwyQU5lLzRGWVRzbXBuOWdtWnJJMnNw?= =?utf-8?B?b3duYXF6Sk9tYUdPejc2dGZKM0VpOVJUR3hiY1ptY1J3WXBuRVVjRkt2bytK?= =?utf-8?B?YlRxajBxdVlER1ovbmpISHpVY2xnZ0VkcnBybVdRTGZvQkZidHNVSnZ0K0xK?= =?utf-8?B?dHZVUk1mRnV0TUQ5MWRaU3V5cVNRdHZVVnQ0Zm5GYXV0ZlBKRE9ETTZTSVVo?= =?utf-8?B?aW9Nazh0MFpvUkxSLzRyQTVhWlV2Y1pYa29DYm9vcEZyNFdBYXdWWWNTbjNZ?= =?utf-8?B?c24wbnJvVCtlYmlCMjA4V0Q2VS92ZHMxQ3VWckpoNFFvbDJaNjNmcWZXWWQ4?= =?utf-8?B?Sk9NUVE3UXprRGFlUGYyWElaOGNGL0lJdEJnbGdlYWprV25yM2JscUtXbGdZ?= =?utf-8?B?MGhwVkk2eVVibU1JQUdoSHFodFNVa1J1VEJFWjZYSG5kNzBsVmdzL3N0bEpJ?= =?utf-8?B?dkQrRUgwbzdoSjhieWVzVUREeEJVT2d5RFptaThyWE4zVmpzcnZvNnNMSHdl?= =?utf-8?B?MDhCNGZOOXM1TFh2cnF0UmcwYStPcDdFUXFqdFV2Q253dGpYZURhbERmcFRw?= =?utf-8?B?a2lrZk9hNi9NK0w1YkZNcUVOOUVRNEdVbDNVMlZURzE0N2N4c0psOUhsSUJV?= =?utf-8?B?dEpwRDNPWWhHRVE2VHJpb2FCM2ZuU1JtQkJpY205L0pDSXZnMmhVTGluZkFQ?= =?utf-8?B?ZzZuYUtMWWhLV0tPUGFnbWUwS0ZyUkdPbkEyOWtnMXl0MnR5VUJpRUx6ZStZ?= =?utf-8?B?ZVhXVkZUOFo4R1ZNTFg0Sy9hb2NwcEpQSGRURlIwbzV2Z2Q3K2M5eXc1cDM5?= =?utf-8?B?ZGM1bkFLYWlGUWNSQ1BjbkR2aHEvTFFNNGV4dWNYclJzOFM3eTdmZU1RMkhv?= =?utf-8?B?S2V5eGlGTUNWQ2lNenhlSENUazV0dlpHZjM5ZUswMlVtRVFrdHExZk5BUS9o?= =?utf-8?B?WU1hM01hbzZUa3VYL2NaVGdHN1BLcGxUQXplWG1UK0ozWXBCaUxVUG9ueFp2?= =?utf-8?B?c1BrOGo3R1VrZDVTREdzMXBhb2tQd0cvZUk2SCtwQlAwR2JLVkdVOHM2OVo4?= =?utf-8?B?eTNYYmZ4RG5VSFJwQ0hkOGJpbEh1dFJ2SWNWcGNpWkYrNE1DcTdsODFOYk9l?= =?utf-8?B?YklUUndoZ01NUzdXVHM4QmIrb1VxRE1xSUNPWXM0N20xZFY4V2NuV0NpOWxu?= =?utf-8?B?MGkzZk1wYXZTaHNHNFBQMllyZXdnY1pRcnR4WCtvNmFnVnI0VytRbllnUDd1?= =?utf-8?B?NHVjZVhnY1V6RG9RdzhBSG8rWWRxVFA4NmdkNFo5NS9qK09ocjF3UGxiTVRn?= =?utf-8?B?M2dyV2ZJV1NPM3p1UURjSVZmTmY5bU91SFpEdlpPcU9uRWVHKzFuYnQ2T2xH?= =?utf-8?B?dXN0S2hYZ084S0JGMFZnUTdNeUpBZnR1UElzbnUzQ28rNTV0ejNTT1EyTnQw?= =?utf-8?B?SFk4aVhqTW5LY2xOOFB2MDdrNDdUYlRNL0I3Z1hlQjk4cENDZENweG1ZbGtO?= =?utf-8?B?ZzZLSm1HVTlmM3V6Q0piU0paRVRyQXpRbnJaU2NDSWxlTmU5U3cwc0t0T2FS?= =?utf-8?B?UEVtZ1B6amZmNDZpNGdVWXFsVmZTOFovZ3ZSbU9QeW5Fa1NFc3BRdlJBPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 53002e2b-e5db-46ca-9aed-08dc89e15cf3 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:40:20.3101 (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: Andreas Rheinhardt: > 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. s/Apply/Applied/ > > - 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". _______________________________________________ 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".