From patchwork Mon Jun 10 13:24:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49769 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c209:0:b0:460:55fa:d5ed with SMTP id d9csp2536204vqo; Mon, 10 Jun 2024 06:40:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVZQ5NdwWvKaVR8NdV2cr3hfXoQ62cNRPWe31554paQYZl767y6FGdYa2C4VsiwTojy3VidJORdaXIIPjyF3q7s1Cdq0koSEgJXrQ== X-Google-Smtp-Source: AGHT+IG+emarP6GDACjmUT6G2KCU5xQUpkNfNpxmV8lKcHhuz0oEpJoXREUbYlGp7GrDdRdqVaLo X-Received: by 2002:a50:c309:0:b0:57c:5caf:2b96 with SMTP id 4fb4d7f45d1cf-57c5caf3050mr4899982a12.2.1718026810762; Mon, 10 Jun 2024 06:40:10 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-57c67ca0665si2808756a12.25.2024.06.10.06.40.09; Mon, 10 Jun 2024 06:40:10 -0700 (PDT) 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=@outlook.com header.s=selector1 header.b=QaX6fM57; arc=fail (body hash mismatch); 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 439A768D760; Mon, 10 Jun 2024 16:40:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-VI1-obe.outbound.protection.outlook.com (mail-vi1eur03olkn2056.outbound.protection.outlook.com [40.92.57.56]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6FCD068D733 for ; Mon, 10 Jun 2024 16:39:59 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AG1nJO6ZHA57W8bw+0ZFyOSGaAVFYFDLAmZ+CzesjfBcw1mEFuuv2grQi55u3MyO1l0yrILTeKQtB6i2jqR5apQ8p2typcgUvZTB95Z8Ng6Erse8ZD2AiXdYtG2Cp0nY9w2mtIq5cNQWiT3gdvUfP/jCFohG5hq38lF0JtLkdcqiO3dslHCRy4k1AqoFnqzrrI8iz+adappRz9lTTMJKAD4OYB0fsesR1n9VynbfdTeeunt7vh3pvvcs5EgfwqgGJK2wLBhuvbSaHHQP/GoV4yD6UKfqWDSq/9ZSeQ0N7UIcW4oa3etvaN/7Ec6lyaNyUAdqzRKoaCCvY72mKSTrRA== 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=dFQuneQb9rF8k67r4MzpoztdabWl22ALBiMsP9EbKTU=; b=TvXh+t3e9vwNAKm6zgh7wnyZzByxsPf3rnCqabR5vvfU0JbTZNxEJ10PEvr4DordP/v947MVCSeOMPHEbUNh+XYFhJqy0M1Z4YGdQLd4tgpd4e9b7Em0DinoavOeOr8HJ5s+fZq/ylCHyJxtIraUAoC4XH9u7hNwXFaBOhykyA4dqbsapY2ZP/a8wstLoviKQocu8wlcYdmV2ojFrw54KCIsxcI/AzaYhYlGFWy3wXwQzdgxKJPimyZmLk+xM1OwD7AxZ/xCDKWquNRJOOatGjPg8J0wItPYU43tiKfy6hp3w65fvzi2vbOmMPywSIbn2v+GPtJDUFTolB3jQuwKLg== 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=dFQuneQb9rF8k67r4MzpoztdabWl22ALBiMsP9EbKTU=; b=QaX6fM57Pcc3hxqpOW1uyc84bLqTRj6BP3ExBLEudhxHH5v2nHegXMDbg9/+d7hHtH/KvhoQgfKEm23qZOmEidIpPw/mG6d0IzLgbiadGlxulRVNawxtLhAHfecnXQpFYsPrYfuRmcrPUTcOcHFGjlNknoMxrqB7MaXVNiLtNeIORNNGpVLZNeJ7g4L87jQijOdMWcwV0utRRUfAkO45BtVLY+GzPrMCS+SqvW0G9YCNgWz4MPXcspdLX5U4y3JyCiA7A2/hrq5PcecZwpovwejr3abEw04H/EjjodDwvH2l08FB75BvaxnXcuy5GW6eVZlUzbFOegfO1IanOzHnRw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS4P250MB0487.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4b6::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.36; Mon, 10 Jun 2024 13:24:56 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7633.036; Mon, 10 Jun 2024 13:24:56 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Jun 2024 15:24:49 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [21MXDMOUAjNMjiyfwbvhktNGpUhx9joDMxq9hWqbBHk=] X-ClientProxiedBy: FR5P281CA0015.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:f2::12) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240610132449.3668210-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS4P250MB0487:EE_ X-MS-Office365-Filtering-Correlation-Id: b3ca53ff-19a1-4d1c-3e7b-08dc8950b84d X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: X+OSWV8Amy9EK19WcNqCXEE70OvTQdISd7mBGKtYKRQjGDWHbpHtiDVStKz55L8t2X2lcr+HXCqsoZ+yvfUK6YIjQj9wdAxMiOGuWdF7dKvMUa3WRdW5rTULTRE0kmIOrPG6HgqFzFMFft3w8PEmeZKORYvsKO/GE6iBo9Pq6UyYnGkeLoxIUTri7/9O/gEFpEhHWh26myN7jrbFo6jzmb+Z8S/YpQDRl5HQ5GEOiIaZN9BWtF/6hi6rc8fz9cMs2ku/fgCeAn9qsZIUzAu9t1rfgRcW+QWYtXBCj7oF3GUVuMdyGlpeiBwRQcQZAa1f1r68si4FVx3Zr7C0KC9tK2rPjdskNRiAXb2J3P+W4nihI1YVrDocs5MKFusxUEDi6bpb4PufQj8Gp38Xho4l8vFUUFxFlxigVhUe4RRhB8Lw4Njlx2JM75ovbSU6h16aHhk8LABjiGChUb/DO0JVgpAPVR6gufyClKxmU4t7h2hmanz1KGvMyxDFBav0JeNAkzUWATUMSSkwlQEGbedK2pTng/s/7g5Jl187ENDFfsaKkGkdF7hV/gE8oDjsVqS1OccujY8LQHFeCdpK6wp9/V42CO6llYUd+zkE3C5LLTPF2/EpeIehdbDB77F+xX0x X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gswAHFtH9CyTqyhyySJQxMGDXEHi/riLi0nvQdzRylCHV6SfYXaHI7jz0soa2FZrw/RforAVefsBZKxCeAvRGSJsJ52k3TI4SbAyeFZpA/Bo8O+cslih1YQs0OAseX3JpriUfg7OzEevoxlYzmlPMvryAyqnK2WnYWXd0QV3Wy/KmFj4nCRbEic3N/sFMAZolhoBf2uDF0r/2OeqHGqIkwGbTrJbgu65f54f/58yT5HhM6k7vkFynGjuEwnppPgEJEaTNzTuxELyOwXtt689Awi7hWWaj2/sPRGIdTN8pXIUCfN4SSQX5LlDFf5QQeTJIWmwTo2rC9OSbAlDSNw5NK6Ga80ECiaKbQUEl4p10GKIvZTqhEbl4Gv79wNVq+wNMj7rQB0hTaG8Fkcs2WtTqlbwGdxRxMxDuUR4Vxbl015qNFNpGfdAG24iU3gUEfgqhisNhpZnkAkIzBP4bQHDXtDaf71Z94epsw8qlDFXtSqij7sJyHNwg82tOjp3aLQc3rKBDc+GM/Yz+pUZhtAUU815L6tGAQd8xkZm1MbTFDqhKdKAaL2UhxCzBg6o2vDI4/kCTE4WhNQBhKx39cAGS79RmuHq3cS5G6sTgpQyhivvqGCBpm3/RP5tgg2x6h70wMI+TCI3t233j70Ry7+f+8ixqrWgM08l+XLirsAXyA7ASe3B5nwPQGzOHp3isbM28LfT6kvBeK6WJri51qR/59pKDo9bqFK9SCWzZmsqJC71AoqB3mKbQ4aeXSr4WPbrSIaqJIDk+WmV6m4YrGCP7WqSLtTCe+slEUPi8K45hCVHKNuSroUpFkPBmAi1K1/9lUh1GGNkF22voKNJnGkeY717gAwaTnWifhrEe7WK/aLfXxJPxRwerKHuZi7p6RGAN1+Hh9WH+8VCEh3FUyaaIhsfuUEt7n7UYrb4juyaZ06de2c/k63szPjH8Mf48d7oMd1gA8HID1yit4hFmba7eeMoeHJ4o8j7e1Dn+Ux4McIWUoee6iRTqnoKoyeUbKWHDqTKdpxR8ZU8yT9/UOx0Xqy3VZ6myxlx5Pzm6eVGIS0r34Sh8Km7kALfjZald2IuD/6R0G2skhyWme6TPaih6ueveoVX4Zqj8nkD3/VQ3DexkTjwXt2SxvSwJLneZ1Y2TUXjawxcgBihCEqVZtGY9KLXf29/i4b7BJY3HxMo4HwJDvx5ECpBAESfXVnNTBy8ZzTLOxyBsoJdvfWSJKyqW7T+9N0gkop4D4lAAK8XTZ1oynVShMM+cmfVXkg5dU5nw9TsDziVxzcn4uMFIlB0tA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b3ca53ff-19a1-4d1c-3e7b-08dc8950b84d X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2024 13:24:56.4439 (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: AS4P250MB0487 Subject: [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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: BDaMIwZLsqOx 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); if (p[8]) { ret = av_parse_time(&t, p + 8, 1);