From patchwork Sat Aug 27 15:19:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37514 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp936503pzh; Sat, 27 Aug 2022 08:19:38 -0700 (PDT) X-Google-Smtp-Source: AA6agR4pctB3/d59q5oT/pBnHUd2inGkNVQZK/O3X2HzCHwb4VS+y0YpxeWh7H0Outp+OkiRHMxm X-Received: by 2002:a17:906:8a74:b0:73d:d6bd:660b with SMTP id hy20-20020a1709068a7400b0073dd6bd660bmr7570956ejc.200.1661613578087; Sat, 27 Aug 2022 08:19:38 -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 y1-20020a056402170100b00447e25f915fsi2744360edu.603.2022.08.27.08.19.37; Sat, 27 Aug 2022 08:19:38 -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=onG9neK3; 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 7635E68B5A5; Sat, 27 Aug 2022 18:19:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066036.outbound.protection.outlook.com [40.92.66.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BCD3168B580 for ; Sat, 27 Aug 2022 18:19:26 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KvGxTAah7oC7wwvKUWdVkXMzEhVtfzFfhnxan1Dn2wjMJZZ9t8KFlRr5r6cutE5ewYAHJL7s/QavxoQoJX8D81lDmr3zdO1ka2PDO1NSiRNeXmETrnyJenqsu4oazWoS7MYIcsRXLxyHK/aiTXF0o4spNf6LDaEO+CviidnrHWe9ihW3EipqiBupT0FwnGd4zr1aayE6uFgBOysQWkbhvP5TupxH3DDQfxFTn/M+xzaPvE7fsH9VK+h/d9JqWBM8vYI0mzOkZ8JgXsuhZZmGMknx1Zmyl8yS/u4q+1dtZCGnpiWM35JbHDJOSmXlNT23M7W+F+IdNbd0g+fvoJV6KA== 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=lS3OPktJh2D+OxWhlHNngWlYdxijGiWrpqEwGlqkpE0=; b=nPQvDMkKXW7lb2EcX9RL2qTqFkdAwDVa93YUSrCe/5w89YBQj52CPBgtxaP9HWxmIvLBu3WDpHZzxw7hQlNWoyR/5MltKeDrgzi+AANbAFimhaErwA1z8/9agC6jMCgo7muatDMszJJ8Tsckyt0CUFlTQJQBWr6bCu9ACAj2equ+S+nZL9LI+eZzH+NpveWTb1mJkzd77JnamkUaIGJFetAu0rg2E0tiaS0UDurA+FxPHgfECHb/jsaXu28lHXVjfIOJWxuweVPWXLvdwJsZvbRmKK+gQytpV0sUy4+G3fEag7ZwHgjC1AkvdKvCPfoijBal6ImCAe2kBAaYunMQiA== 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=lS3OPktJh2D+OxWhlHNngWlYdxijGiWrpqEwGlqkpE0=; b=onG9neK3D+TsDBx1w0cOdBpYR8AXI7Zz9BPGIU5QPND4DdpiFs1Re7TxglVmNXpVaNhkC3Ho3jQtHhzioGPlXtcOlxR28LiS7fgl4aaTMCKswBmLjk/vO+Gmquzc/oVJMpuoF7yBiRedhAy91YBvYXEtI2B/DdizRHURVNCtdcBSruIu2aZ9qhH6HXr2ubtjyJ1yNQ+eJE8SEvoou4NJUdbb+1jbo2KKAmWg37iTO5gzc7hhTDjeLhmS4LDw4aKHlRfikfiXWgKiHMTyAAqZvfbPP0jOxlVdfKL1uf5CxXj6BxPDIudUTZ8jB8nQsZ+nUJ5uC3LGiPikeCJAR44PZQ== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by HE1PR0101MB2154.eurprd01.prod.exchangelabs.com (2603:10a6:3:21::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5566.14; Sat, 27 Aug 2022 15:19:24 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::4cb9:bf7a:dbc5:fe84]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::4cb9:bf7a:dbc5:fe84%7]) with mapi id 15.20.5566.016; Sat, 27 Aug 2022 15:19:24 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 27 Aug 2022 17:19:14 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [MhPsR/EZuLEM50vr2qp2N2SKkc41ATEY] X-ClientProxiedBy: AM6PR02CA0007.eurprd02.prod.outlook.com (2603:10a6:20b:6e::20) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220827151916.3004323-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ab1c9e4f-e829-4a5f-d639-08da883f85fb X-MS-Exchange-SLBlob-MailProps: C/ir7cSdGluuwyNECrLR46EO1b5Rr8GAq1VFsFDVFO9go9Scia2JwefszFpRtd8OrqqRXSPTMGW7u8p/XoF13HJIW4eE6aUG0VTU7wnLSjjppDsaBUPVF86bU9i4B9+wz7BrDMBrnf7KF5kbQD915MA5bZrKQYRstycI1Pcwa1AJ4bXtsRbrLNnERJEgQgCR5pAyB0snDnIigZbEw7PjShDlKzwW6bKvhzyZAgocu10fvktM/JKSLAcafT7Y8B7s2xcUfdkEu0Jtav0Qw/MAP+qh9wdqLdjaSUescmDvp7+ZgEToFX2L2AkLEhNR9K9SrHwShXr5Gu0hqb3qQvl1YcAuawUU6iwlKhEeAgAEEz7gWudaSPFoVzEmq2aCIflSPhUp7vwGRO0lPBwowasusoSUrvPN/11tZs+7FGGq+lNZ7Jel3eNLFcqIQJk9S5AeBSwFd/7SZ/eCsrQGyjE4/EgLzegVrwu84Vae5c1lcMV/j11f1YZgt0sLuT1o+9X6XuZKUKNCy5lX4RSvCnSG8yKJRgK7bMzig0R9e8YwpDGhmSWTHHMaEY0KO+6RV9g6QbKqFxd/XXCe5kXLm4dntPGuR+8Z/gXBWKoHIbzuvJHqofr4NZ62xkvbcBJ+LLTRD0FTWfdeMK0uzX8VhxXXHCBZSDNzzhR79x6OdWwYfD4xf0DEum6U8i92aLTCcOjkYqjKWAm/wryrxWAB8/Qr2i1rR9kiwu6mtkjq1+TGMw1tSpf8QXSeycTWQ7WCGMEy X-MS-TrafficTypeDiagnostic: HE1PR0101MB2154:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YK4UPn4xqvf9ZV186P1nk+7OfnKUUwMNGH6wRaQrqCCkjfj43Lpxb4ce/HobM+gNmYIMaafvNBqwoRUbMERxPAh85hJbTCftN4n76z6BpjCVdsDGjmHv6DraLXfUfMeGeqZvR++C2xg6Sf8Y6B7MEhJ9jE6IcumgDaLLBwdsy9RldnR79YWeOTysiw8a+dUzU/5AD74QLBX/SID+D4zBUwZd+X55/6rAjxHf6U/TaovzAzLzY69wKvOCfJdvfc8pL1LrAWw04RA33LGICK3AmOdJP0Fp7zVC0SXdDatl5pxya3fgBrQjD+cEXGcO8r0i0Oh7+cp+nCuVV66E5ZfX1WGvt9LjFo4Hhy8GohfrecQOQ/aRAjisrxwLidimdCRnvUbHMwaNB2Cdwx7TgpZtMQHDywG8TG/RzWwIJtteEzNgUtZ3NzcHL2lLW1+wZ6DR2Bgp5UJG1QRU2E9dgBBr7apwTwAI6XTDvjtUU+iuDBMqaIcamJrueg/vcAVuVyk8DDHhODOAJW4OqQA7QPedQ0RnCTPXmVLNFJnXut/Q+BXkzd8/bflXHE7coqq+jj+tAYqe9SX9HNVeSmGpV8O+bNRt5B0Rr13kk6DnCgLhHuwCI6d97C1XuMutkD+pHe43txJxJbfnjXzvkbogAwbMPw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RoLOiuf33Q5UhwtwK5b8OsIW0COOCtetaZesPVa0RojbwsLthCSHhASE6gWfzkkEPVkBaeodjIxbLmMMA/SDR+nOrJHjrU2e/3esuCGbrLiXLDEcDKiqOSvtxqpEfrWMB7uyPPFmR6J8d1ar0hZrmI/QSKMSfIarG1PAvvC8t/taumBRaXsfwn+1OWBZlZ+EAf57VjDNDCxYOWw0SyDedxvHdegI0pc1baS5F1vF8X566sRiBuXlc3cbIk4vITrQ8JYmDEkxS7nX4fZJwNHAqTsXLiljcvzFKW8rLWSCP5gUUHphxIHWedCFvIvk24B0xm/benA+hw8KLcM9QF/Ji5m81JV+b7AodIdcyJrFQN1bC7G45UtySXJS6+RZyJQuR4Xv3Xu+sU2jmt7wvyo/fE3KrH5px4+w8YHORuolXZi3uK6BibH4jRkJ1aWxEFGAsSAyCEiVXcSNsDmmkbGcDt9yClE8sAn806DuZmzBrrKA2UHgDJn/5qtH9iuh9jFANyCD1PdWOL1lVSW/jlu4koCpU7jZy0czJ7cOoJSETZ6GdW3sgeTUmgZuZnx9hv5qjHeWUrPekwbliNk5Hx3w19mntYWWWyq7uV8HC1zU+UFuWKLieiqn1WXoTkjnqlV3liK5t+48BCZQHZbOdgi5r0GeE0e2SgTLslKewudX2fVdboH9BdbPdeKxjhZfYFP5+cWYeTzZUMjCGw3i9q2hmR3w0ELbCBnYJwFJx5qBd8HGg+GkJt2phV1rqtTxSbAt3zRuevJ4zMbA+36jKS5PZ8Qt+bcCaF/+BuDdR9H4R9M0eTwC/lzfN3boBL6dZnZCwk26xzdpDVYhWti6yqtmkLImobWLXZJVcTrgZA8m5wbsShYbUUYJnX5yp+YPyewzrM7rgqVqCr5TeyqipbXWbE7bTV9UovCl7BIDcAYYKzdfko8/ghtXLmd9rUpynaaxNAtsh/s/hPYXP2rSTTIPQBiLTu/2XvTQl6axK/+mw0mwhEb3nPrFREapPLG81E1Yz8prx/+F+MJCAODWXD/Ga00QcuUWs0TnQtVxcY/w8/na3w4yt14XG/fG/4C+bCx0RJ0YZkBPG30lZgz6UCy5+Z/berwXQON0f4LHB6AL9uSDec8JYgop+r/HjLDVlCoMBomvHQEFwQK0j7EkiFqEHxU+Z8X3PrRbHd07No02fyJPoIPYzkQTZyqVcTdGxTS+Pk2zKisoca0Jaxy2zsMQxZKE+1m+SOxz+S8u5Bz4GBTmVdo65TD6OvkxFTD/9QSRvPoTARpkEfFKLOKjj2LkIIIPzi1ehsxnbsHbNoHPBfM= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ab1c9e4f-e829-4a5f-d639-08da883f85fb X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2022 15:19:24.2131 (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: HE1PR0101MB2154 Subject: [FFmpeg-devel] [PATCH v2 1/3] fftools/cmdutils: Add function to report error before exit 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: James Almer , Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 9GHkHtP7v+J/ This is designed to improve and unify error handling for allocation failures for the many (often small) allocations that we have in the fftools. These typically either don't return an error message or an error message that is not really helpful to the user and can be replaced by a generic error message without loss of information. Reviewed-by: James Almer Signed-off-by: Andreas Rheinhardt --- fftools/cmdutils.c | 6 ++++++ fftools/cmdutils.h | 11 +++++++++++ 2 files changed, 17 insertions(+) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 18e768b386..da3d391694 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -90,6 +90,12 @@ void register_exit(void (*cb)(int ret)) program_exit = cb; } +void report_and_exit(int ret) +{ + av_log(NULL, AV_LOG_FATAL, "%s\n", av_err2str(ret)); + exit_program(AVUNERROR(ret)); +} + void exit_program(int ret) { if (program_exit) diff --git a/fftools/cmdutils.h b/fftools/cmdutils.h index d87e162ccd..4496221983 100644 --- a/fftools/cmdutils.h +++ b/fftools/cmdutils.h @@ -54,6 +54,17 @@ extern int hide_banner; */ void register_exit(void (*cb)(int ret)); +/** + * Reports an error corresponding to the provided + * AVERROR code and calls exit_program() with the + * corresponding POSIX error code. + * @note ret must be an AVERROR-value of a POSIX error code + * (i.e. AVERROR(EFOO) and not AVERROR_FOO). + * library functions can return both, so call this only + * with AVERROR(EFOO) of your own. + */ +void report_and_exit(int ret) av_noreturn; + /** * Wraps exit with a program-specific cleanup routine. */ From patchwork Sat Aug 27 15:19:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37515 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp936800pzh; Sat, 27 Aug 2022 08:20:18 -0700 (PDT) X-Google-Smtp-Source: AA6agR43jKii+st8uM26G6PgKVtX1avpGBKayAdBqwp2YaYhyHnpOVYcm9pLemNTH7l9WPqxU5rf X-Received: by 2002:a17:907:c28:b0:73d:beb7:b9c2 with SMTP id ga40-20020a1709070c2800b0073dbeb7b9c2mr8378705ejc.336.1661613618291; Sat, 27 Aug 2022 08:20:18 -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 r10-20020a508d8a000000b00446b4aa5d32si2586744edh.71.2022.08.27.08.20.17; Sat, 27 Aug 2022 08:20:18 -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="chyc/0ve"; 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 9D31D68BA59; Sat, 27 Aug 2022 18:20:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2081.outbound.protection.outlook.com [40.92.91.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7AE0068B9E4 for ; Sat, 27 Aug 2022 18:20:08 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=T94RR+yWkkUgcfN4tT2eBvUsx0Am3NOcneqWhl00hS6Sd0H/g/Z26LaVlGs5k7QzgbRU3u0MzNbTM0C/Cm4hqNNx5Hn7CgyV4b1lFgxmsBk1kjpu8WRmkWbHe9ed/oYr9RzFquc7QITntX6NOlZJcjC0CDiZD8WxVHexNXdeSJtgtMrgr7L+Sa07jfhOofgMYQql+wG02FKN6l2FmAAcVk/frYVraxEJQKYp4EiA7mcIOx7aaGOS95bmuKjMOEB8gF0h2JWprJ0iQs2GUkRi/gpqgS7N44B4UyxgvM6sGlV9J8lkQVcuclleQq8DInc3fV/6xAiokccUTAtXG5ntsA== 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=+f8zQf9O8Jxx0ai+5SoPRd+5adt5ow6mPRN6KwMozOY=; b=A66UhVX86kfte9Fp61B67795Bym9+1aADLWjM/JU4aVmQua1Q7FgwSGrGz3oDJmgVqOMupvS0AsymEC8/12jU4E5IX9VDQ/TAh/ar9I1HafUnfGR0S8kAmQ7xNJYiU/yvAH+rOV3fVi4GVMnDiJpBSUEdzqgB6v+e2clEefstKaMSjsXe7aAXGEoYxYHTs9L27qqHtD1WbrBV1Lu1LiPw+Cgrae28nfvdpvhNWzL1u2ATTOr+GNyBvYkgm76Hcjd9YDS28/0nulQUeNa4F6fRhGcz1bSFKdZcKMYlkzra2xGFXNACo0UwlY8n/065zxMbhbrcEIBQEDK+T0GEZ6SBA== 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=+f8zQf9O8Jxx0ai+5SoPRd+5adt5ow6mPRN6KwMozOY=; b=chyc/0vei3Xq+5rRn1HeuuIB1Ed1/Ac7MX4ssXKRma5LByD9Z4HtTuXu3XjEKbZ9pSCzmcFx1xRU6//2K0ziP6jQPdwU9aKJjqL1dK7xcL+qVj8o3Hqg1vQnquqHo5e9RIO+ID/Ebpz+AzJMM2K8GBxesvPsv9GnSVLh5NCb2+qBnsU/GnsNczyHst8xIKVyu9ZjecYgO4Iot23Eg/PPAePu7JQhs4V38YaelQNd8AJ+zBz54Lbg2dCxseHOmveXm4b7+DeCUJWWBd3atFEREcwFnXSfMVk3xgFaL7O4MEgTPgb6MYv53FetT+KWyNLkJqHwD93RdRUtk65KyM6k7g== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by HE1PR0101MB2154.eurprd01.prod.exchangelabs.com (2603:10a6:3:21::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5566.14; Sat, 27 Aug 2022 15:20:06 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::4cb9:bf7a:dbc5:fe84]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::4cb9:bf7a:dbc5:fe84%7]) with mapi id 15.20.5566.016; Sat, 27 Aug 2022 15:20:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 27 Aug 2022 17:19:57 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [yqi4QTvyaPAv0o6wWSyAJbyEF9K5Rk2E] X-ClientProxiedBy: AM5PR0701CA0020.eurprd07.prod.outlook.com (2603:10a6:203:51::30) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220827151958.3004351-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 55db2dab-4bbd-4973-2235-08da883f9f36 X-MS-Exchange-SLBlob-MailProps: feAVlmA1hHVjJ50BCCwDqmUfKVfAL0XJbvl2fBMnr39Rm/Fy1exCCzkdJR72VVrlLLkyOwp8hLfAeyBsVgslxkVDWxLEMjb3pmYGF2XCyS0FuK9jUx29UrCeHgs6MgjNUPPoJ8RxhtmCMTps03yRJ0Qrj/zelapBNrXBCNChgEYUZkqyYsZzTAejCuzzRjeWCdOF/4jyKIALMwOUsdvWonKJmDBCamYJWsuiNlNwvOwDAMygMtpIzEdNV2pU1TawJRg6XhaM1d7rZRYiDvwtrPjRLFkMp4cl46EFbyh7gRjJP4vCRKjxmlYssTIlP638+lQD+bG/twbkPyeaWZtWhkQdw3vhpJFOm3SCmvD2qyrWa+0KXsLxZ/FttpmlMc6oGTXjImavmWaHnq0t3799RjVS2WSwDkQTNT4ORBpmHdyvgy3Jmo/lrsmB2wBzko9o0SBpQiwlmmQQmWeYHRpM2VYOmBy7YCF3kxuUqetaJKmVpcirNqtPKag4YM6GCQfKdaDloguOWT8qXHhUP5RG0QxS2KaU+NVgo9kvVDR4+0yBZlTreAhVbH1wCasZMAC69ygzKAshwaMFWn0aEw//CidRKg6V0ip61QSHVIHBUPFWZ6RTgbE4c6V55UhrygLKD8rS7ZUPemY8tcp+RPrP7wn+HIQBDkR9/X+8dcfGXNDldhT3Rny5UcuXGDaM0s+G/y5r9vXf0s53RLau8Rjzeg== X-MS-TrafficTypeDiagnostic: HE1PR0101MB2154:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xR2VT2uVfFg+OEqqOhf74tbfiKA+yYjdfMPzns7pvzAYCPXQGL+pIiBlV+KLJ6DDn18lLcPB7kUG+KSgysjVmsTlxmJ+G7L6z7z5Z2KfY0pyFnJZcmm97mkfXzZNVTPTks1xmajODlfxn41xKbjjQX8DCa6IAxsPTj2qwjvYaS0Q1nvVJ9s3Aq5jDyLxYkjxpMkwPRG69qYBZYVJlyUBdjbcd8AeFFLnW6IuH2hlS6VJxWpKQidSJzoN0dlRaAFvVgE5XDi/gy+CwUO5WihlS+fPDf8T0shQ4psaJqSPzUc1ow4lXY4UW2qorbN2TL3MOP9IEENMyUAMl8Bo8xa1k5nL6GmnO3znQ/tvOy999t958V2plXWEJg6ytycYfIQIbR+U0QvYXD+SaTEdgnXM4Kifs5oiopLndvbM0w5sP0womRQ46Q6guVgVtVZEpAVfxb0hX7IBIlB7A0MEu/pXVBbl/CEJPSuEig4lkZyflyNqrYBE0msAsesv2V9SlwdCldqi8z3oKBFE2/aplKff6MmX1pEO8US+vGf2mlMq6sILMbus3humnS5GMAkGP4ii0EFm7vxuiu/hzgsoK+nDM4sEVyXcw6SaUkMwaaYOuey0Y7SQ/1bl0I1ZLsx1gzZ9X4cE4BuZSNx5CYdP4m+fYw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FOrfzf8VFVB4+RIZhUu2xeNSEWivYxsrNi2SBK3d2hAHGAR4H/n1UjMPOb2CQEvuARZirJXaYoqismXsI9R9P0AoigaaZ5P65sOPT73ezwvMyWlIFpaRtC2QtWj0KMk64+9PhTYfwp3W5Kn55aCmxWQqgjThtsRfuO1E+KdIvYJ9ypdn2gCAubA78OWca5JNSkEgdJhH1U3xuHGjxXqTtDw4x+QCLEAWmB78mY/PBuNpADOguRcaG+O1XZd1zue8iIAnH51eqcuK3qBUQkhYv39ctUafJ3OEDdcZbF28gkRn/v6iuKRKD103NvzOp8ngLvy3QIFhPBGQ8Q0TgYRTvRL4bujI/o+hbEUflzdbUs5szV1+OXrlWqXfCVITU61+p8awly2mBg9WQPtWJW0XwGcF0Gg2YUh5FOZ6awZCzCT71n5VHBKC1MRTpEdpx/KQ+BPrLRtvgsJYpuJbGD94j2eZjTVEk3LrI1OT8XU6ciu254YE0vvILsoEfgL6XSfwWz68FQ6tqK/EPf00y+/jSUxDyOqmMJ+2T4mbv54WC4CqOpRZSPz9XQKTQDNqa/gi2MOC/eriq+gI+IXawMyhRuJtyGNYUHsGmWF1JPhzj2Z1cTXtDyURqtuW0U8nuozqUDTXs/UE5vyozm6re0XlPEGh+mggmDD4IpRlKWJOeJx2Kds6KzEirUvsFG9CBVhbYX2izpZ6oRCPT1udy6a2vfOv6w/fvzp6prBP9/aW2ZMvNsJmiMSDMKiD2y9izxB3caj6v5FzHqY9z3pyx36eC9unGO8aDCoAujWCCiq2E7AlkeTDDwYyS3BSLooV9bXOiY+p3hCQvndVjaq06g5Zk41PJv5oBFKPqemqBlV67roRRhAbFpftxodbKx8nt2DpobADprUeEnWeF+z4D5Z2QjNz6w3S6pg59msHDOJzpXaAeUGUk6E7cQTnH1JL5MKhgHUyLM1uXmH9Yt7zv1ke8PMSXxdotO7ZYrM/tqYKqR4Dlugkuw2CDNTat+Mtn2RSUzKjNfkQ8shASyvTvMiq4gOJH8jBLT9DTGeCipEQJYfhijb2sW/IQE9kWa0VUNdMkurB97YIQjNK6vh3q80wWFk9vsoYbjLv5vd90CPpA6DJ3LwjbX01/Ha8o6SJNacCwwXQqfbAsjNmrcnFpxOls1sNWTvJ18QMvuklmfsphb9pAf0QYGUJ0ok+UPGT7fcFoAD6zXD9f4kI1ozfuvf3f2S5h1bvWwhZDVCH6KzPer8egYJ6w9p5ovxGGM9y6YYvnPVjm/qNv9jbHJVGLPmgPhjJoz8LTEg0khFJK/iU3io= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 55db2dab-4bbd-4973-2235-08da883f9f36 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2022 15:20:06.4757 (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: HE1PR0101MB2154 Subject: [FFmpeg-devel] [PATCH v2 2/3] fftools: Use report_error_then_exit_program() for allocation failures 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: mGLVoTLfEw71 Signed-off-by: Andreas Rheinhardt --- fftools/cmdutils.c | 21 +++++-------- fftools/ffmpeg.c | 25 ++++++--------- fftools/ffmpeg_filter.c | 10 +++--- fftools/ffmpeg_opt.c | 70 ++++++++++++++++------------------------- fftools/ffprobe.c | 6 ++-- fftools/opt_common.c | 6 ++-- 6 files changed, 52 insertions(+), 86 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index da3d391694..f911c52be2 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -656,7 +656,7 @@ static void init_parse_context(OptionParseContext *octx, octx->nb_groups = nb_groups; octx->groups = av_calloc(octx->nb_groups, sizeof(*octx->groups)); if (!octx->groups) - exit_program(1); + report_and_exit(AVERROR(ENOMEM)); for (i = 0; i < octx->nb_groups; i++) octx->groups[i].group_def = &groups[i]; @@ -964,11 +964,8 @@ AVDictionary **setup_find_stream_info_opts(AVFormatContext *s, if (!s->nb_streams) return NULL; opts = av_calloc(s->nb_streams, sizeof(*opts)); - if (!opts) { - av_log(NULL, AV_LOG_ERROR, - "Could not alloc memory for stream options.\n"); - exit_program(1); - } + if (!opts) + report_and_exit(AVERROR(ENOMEM)); for (i = 0; i < s->nb_streams; i++) opts[i] = filter_codec_opts(codec_opts, s->streams[i]->codecpar->codec_id, s, s->streams[i], NULL); @@ -983,10 +980,8 @@ void *grow_array(void *array, int elem_size, int *size, int new_size) } if (*size < new_size) { uint8_t *tmp = av_realloc_array(array, new_size, elem_size); - if (!tmp) { - av_log(NULL, AV_LOG_ERROR, "Could not alloc buffer.\n"); - exit_program(1); - } + if (!tmp) + report_and_exit(AVERROR(ENOMEM)); memset(tmp + *size*elem_size, 0, (new_size-*size) * elem_size); *size = new_size; return tmp; @@ -999,10 +994,8 @@ void *allocate_array_elem(void *ptr, size_t elem_size, int *nb_elems) void *new_elem; if (!(new_elem = av_mallocz(elem_size)) || - av_dynarray_add_nofree(ptr, nb_elems, new_elem) < 0) { - av_log(NULL, AV_LOG_ERROR, "Could not alloc buffer.\n"); - exit_program(1); - } + av_dynarray_add_nofree(ptr, nb_elems, new_elem) < 0) + report_and_exit(AVERROR(ENOMEM)); return new_elem; } diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index ef7177fc33..8f53f5c7ef 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -1094,10 +1094,8 @@ static void do_subtitle_out(OutputFile *of, return; ret = av_new_packet(pkt, subtitle_out_max_size); - if (ret < 0) { - av_log(NULL, AV_LOG_FATAL, "Failed to allocate subtitle encode buffer\n"); - exit_program(1); - } + if (ret < 0) + report_and_exit(AVERROR(ENOMEM)); sub->pts = pts; // start_display_time is required to be 0 @@ -2345,7 +2343,7 @@ static int transcode_subtitles(InputStream *ist, AVPacket *pkt, int *got_output, if (!ist->sub2video.sub_queue) ist->sub2video.sub_queue = av_fifo_alloc2(8, sizeof(AVSubtitle), AV_FIFO_FLAG_AUTO_GROW); if (!ist->sub2video.sub_queue) - exit_program(1); + report_and_exit(AVERROR(ENOMEM)); ret = av_fifo_write(ist->sub2video.sub_queue, &subtitle, 1); if (ret < 0) @@ -2874,7 +2872,7 @@ static void set_encoder_id(OutputFile *of, OutputStream *ost) encoder_string_len = sizeof(LIBAVCODEC_IDENT) + strlen(ost->enc->name) + 2; encoder_string = av_mallocz(encoder_string_len); if (!encoder_string) - exit_program(1); + report_and_exit(AVERROR(ENOMEM)); if (!of->bitexact && !ost->bitexact) av_strlcpy(encoder_string, LIBAVCODEC_IDENT " ", encoder_string_len); @@ -2897,10 +2895,8 @@ static void parse_forced_key_frames(char *kf, OutputStream *ost, n++; size = n; pts = av_malloc_array(size, sizeof(*pts)); - if (!pts) { - av_log(NULL, AV_LOG_FATAL, "Could not allocate forced key frames array.\n"); - exit_program(1); - } + if (!pts) + report_and_exit(AVERROR(ENOMEM)); p = kf; for (i = 0; i < n; i++) { @@ -2919,11 +2915,8 @@ static void parse_forced_key_frames(char *kf, OutputStream *ost, if (nb_ch > INT_MAX - size || !(pts = av_realloc_f(pts, size += nb_ch - 1, - sizeof(*pts)))) { - av_log(NULL, AV_LOG_FATAL, - "Could not allocate forced key frames array.\n"); - exit_program(1); - } + sizeof(*pts)))) + report_and_exit(AVERROR(ENOMEM)); t = p[8] ? parse_time_or_die("force_key_frames", p + 8, 1) : 0; t = av_rescale_q(t, AV_TIME_BASE_Q, avctx->time_base); @@ -3861,7 +3854,7 @@ static int process_input(int file_index) dst_data = av_packet_new_side_data(pkt, src_sd->type, src_sd->size); if (!dst_data) - exit_program(1); + report_and_exit(AVERROR(ENOMEM)); memcpy(dst_data, src_sd->data, src_sd->size); } diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 16622e49c1..8b32a80ebf 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -118,7 +118,7 @@ static const char *choose_pix_fmts(OutputFilter *ofilter, AVBPrint *bprint) av_bprintf(bprint, "%s%c", name, p[1] == AV_PIX_FMT_NONE ? '\0' : '|'); } if (!av_bprint_is_complete(bprint)) - exit_program(1); + report_and_exit(AVERROR(ENOMEM)); return bprint->str; } else return NULL; @@ -182,7 +182,7 @@ int init_simple_filtergraph(InputStream *ist, OutputStream *ost) InputFilter *ifilter; if (!fg) - exit_program(1); + report_and_exit(AVERROR(ENOMEM)); fg->index = nb_filtergraphs; ofilter = ALLOC_ARRAY_ELEM(fg->outputs, fg->nb_outputs); @@ -199,7 +199,7 @@ int init_simple_filtergraph(InputStream *ist, OutputStream *ost) ifilter->frame_queue = av_fifo_alloc2(8, sizeof(AVFrame*), AV_FIFO_FLAG_AUTO_GROW); if (!ifilter->frame_queue) - exit_program(1); + report_and_exit(AVERROR(ENOMEM)); GROW_ARRAY(ist->filters, ist->nb_filters); ist->filters[ist->nb_filters - 1] = ifilter; @@ -223,7 +223,7 @@ static char *describe_filter_link(FilterGraph *fg, AVFilterInOut *inout, int in) res = av_asprintf("%s:%s", ctx->filter->name, avfilter_pad_get_name(pads, inout->pad_idx)); if (!res) - exit_program(1); + report_and_exit(AVERROR(ENOMEM)); return res; } @@ -308,7 +308,7 @@ static void init_input_filter(FilterGraph *fg, AVFilterInOut *in) ifilter->frame_queue = av_fifo_alloc2(8, sizeof(AVFrame*), AV_FIFO_FLAG_AUTO_GROW); if (!ifilter->frame_queue) - exit_program(1); + report_and_exit(AVERROR(ENOMEM)); GROW_ARRAY(ist->filters, ist->nb_filters); ist->filters[ist->nb_filters - 1] = ifilter; diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 8128dcf9fb..ccb79d920c 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -996,7 +996,7 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic) if (hwaccel_device) { ist->hwaccel_device = av_strdup(hwaccel_device); if (!ist->hwaccel_device) - exit_program(1); + report_and_exit(AVERROR(ENOMEM)); } ist->hwaccel_pix_fmt = AV_PIX_FMT_NONE; @@ -1027,10 +1027,8 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic) ist->prev_pkt_pts = AV_NOPTS_VALUE; ist->dec_ctx = avcodec_alloc_context3(ist->dec); - if (!ist->dec_ctx) { - av_log(NULL, AV_LOG_ERROR, "Error allocating the decoder context.\n"); - exit_program(1); - } + if (!ist->dec_ctx) + report_and_exit(AVERROR(ENOMEM)); ret = avcodec_parameters_to_context(ist->dec_ctx, par); if (ret < 0) { @@ -1040,11 +1038,11 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic) ist->decoded_frame = av_frame_alloc(); if (!ist->decoded_frame) - exit_program(1); + report_and_exit(AVERROR(ENOMEM)); ist->pkt = av_packet_alloc(); if (!ist->pkt) - exit_program(1); + report_and_exit(AVERROR(ENOMEM)); if (o->bitexact) ist->dec_ctx->flags |= AV_CODEC_FLAG_BITEXACT; @@ -1094,7 +1092,7 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic) ist->par = avcodec_parameters_alloc(); if (!ist->par) - exit_program(1); + report_and_exit(AVERROR(ENOMEM)); ret = avcodec_parameters_from_context(ist->par, ist->dec_ctx); if (ret < 0) { @@ -1224,10 +1222,8 @@ static int open_input_file(OptionsContext *o, const char *filename) /* get default parameters from command line */ ic = avformat_alloc_context(); - if (!ic) { - print_error(filename, AVERROR(ENOMEM)); - exit_program(1); - } + if (!ic) + report_and_exit(AVERROR(ENOMEM)); if (o->nb_audio_sample_rate) { av_dict_set_int(&o->g->format_opts, "sample_rate", o->audio_sample_rate[o->nb_audio_sample_rate - 1].u.i, 0); } @@ -1476,10 +1472,8 @@ static char *get_line(AVIOContext *s, AVBPrint *bprint) while ((c = avio_r8(s)) && c != '\n') av_bprint_chars(bprint, c, 1); - if (!av_bprint_is_complete(bprint)) { - av_log(NULL, AV_LOG_FATAL, "Could not alloc buffer for reading preset.\n"); - exit_program(1); - } + if (!av_bprint_is_complete(bprint)) + report_and_exit(AVERROR(ENOMEM)); return bprint->str; } @@ -1567,10 +1561,8 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e double qscale = -1; int i; - if (!st) { - av_log(NULL, AV_LOG_FATAL, "Could not alloc stream.\n"); - exit_program(1); - } + if (!st) + report_and_exit(AVERROR(ENOMEM)); if (oc->nb_streams - 1 < o->nb_streamid_map) st->id = o->streamid_map[oc->nb_streams - 1]; @@ -1592,19 +1584,17 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e if (ost->enc) { ost->enc_ctx = avcodec_alloc_context3(ost->enc); - if (!ost->enc_ctx) { - av_log(NULL, AV_LOG_ERROR, "Error allocating the encoding context.\n"); - exit_program(1); - } + if (!ost->enc_ctx) + report_and_exit(AVERROR(ENOMEM)); } ost->filtered_frame = av_frame_alloc(); if (!ost->filtered_frame) - exit_program(1); + report_and_exit(AVERROR(ENOMEM)); ost->pkt = av_packet_alloc(); if (!ost->pkt) - exit_program(1); + report_and_exit(AVERROR(ENOMEM)); if (ost->enc) { AVIOContext *s = NULL; @@ -1897,28 +1887,22 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in MATCH_PER_STREAM_OPT(intra_matrices, str, intra_matrix, oc, st); if (intra_matrix) { - if (!(video_enc->intra_matrix = av_mallocz(sizeof(*video_enc->intra_matrix) * 64))) { - av_log(NULL, AV_LOG_FATAL, "Could not allocate memory for intra matrix.\n"); - exit_program(1); - } + if (!(video_enc->intra_matrix = av_mallocz(sizeof(*video_enc->intra_matrix) * 64))) + report_and_exit(AVERROR(ENOMEM)); parse_matrix_coeffs(video_enc->intra_matrix, intra_matrix); } MATCH_PER_STREAM_OPT(chroma_intra_matrices, str, chroma_intra_matrix, oc, st); if (chroma_intra_matrix) { uint16_t *p = av_mallocz(sizeof(*video_enc->chroma_intra_matrix) * 64); - if (!p) { - av_log(NULL, AV_LOG_FATAL, "Could not allocate memory for intra matrix.\n"); - exit_program(1); - } + if (!p) + report_and_exit(AVERROR(ENOMEM)); video_enc->chroma_intra_matrix = p; parse_matrix_coeffs(p, chroma_intra_matrix); } MATCH_PER_STREAM_OPT(inter_matrices, str, inter_matrix, oc, st); if (inter_matrix) { - if (!(video_enc->inter_matrix = av_mallocz(sizeof(*video_enc->inter_matrix) * 64))) { - av_log(NULL, AV_LOG_FATAL, "Could not allocate memory for inter matrix.\n"); - exit_program(1); - } + if (!(video_enc->inter_matrix = av_mallocz(sizeof(*video_enc->inter_matrix) * 64))) + report_and_exit(AVERROR(ENOMEM)); parse_matrix_coeffs(video_enc->inter_matrix, inter_matrix); } @@ -1975,7 +1959,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in MATCH_PER_STREAM_OPT(passlogfiles, str, ost->logfile_prefix, oc, st); if (ost->logfile_prefix && !(ost->logfile_prefix = av_strdup(ost->logfile_prefix))) - exit_program(1); + report_and_exit(AVERROR(ENOMEM)); if (do_pass) { char logfilename[1024]; @@ -2055,7 +2039,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in ost->last_frame = av_frame_alloc(); if (!ost->last_frame) - exit_program(1); + report_and_exit(AVERROR(ENOMEM)); } else check_streamcopy_filters(o, oc, ost, AVMEDIA_TYPE_VIDEO); @@ -2146,7 +2130,7 @@ static OutputStream *new_audio_stream(OptionsContext *o, AVFormatContext *oc, in ost->audio_channels_mapped + 1, sizeof(*ost->audio_channels_map) ) < 0 ) - exit_program(1); + report_and_exit(AVERROR(ENOMEM)); ost->audio_channels_map[ost->audio_channels_mapped++] = map->channel_idx; } @@ -2875,7 +2859,7 @@ static void set_channel_layout(OutputFilter *f, OutputStream *ost) /* Pass the layout through for all orders but UNSPEC */ err = av_channel_layout_copy(&f->ch_layout, &ost->enc_ctx->ch_layout); if (err < 0) - exit_program(1); + report_and_exit(AVERROR(ENOMEM)); return; } @@ -2896,7 +2880,7 @@ static void set_channel_layout(OutputFilter *f, OutputStream *ost) /* Use it if one is found */ err = av_channel_layout_copy(&f->ch_layout, &ost->enc->ch_layouts[i]); if (err < 0) - exit_program(1); + report_and_exit(AVERROR(ENOMEM)); return; } /* If no layout for the amount of channels requested was found, use the default diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 8983dc28cc..3344a06409 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -3291,10 +3291,8 @@ static int open_input_file(InputFile *ifile, const char *filename, int scan_all_pmts_set = 0; fmt_ctx = avformat_alloc_context(); - if (!fmt_ctx) { - print_error(filename, AVERROR(ENOMEM)); - exit_program(1); - } + if (!fmt_ctx) + report_and_exit(AVERROR(ENOMEM)); if (!av_dict_get(format_opts, "scan_all_pmts", NULL, AV_DICT_MATCH_CASE)) { av_dict_set(&format_opts, "scan_all_pmts", "1", AV_DICT_DONT_OVERWRITE); diff --git a/fftools/opt_common.c b/fftools/opt_common.c index ae5e28a5af..7cd8b1c66e 100644 --- a/fftools/opt_common.c +++ b/fftools/opt_common.c @@ -639,10 +639,8 @@ static unsigned get_codecs_sorted(const AVCodecDescriptor ***rcodecs) while ((desc = avcodec_descriptor_next(desc))) nb_codecs++; - if (!(codecs = av_calloc(nb_codecs, sizeof(*codecs)))) { - av_log(NULL, AV_LOG_ERROR, "Out of memory\n"); - exit_program(1); - } + if (!(codecs = av_calloc(nb_codecs, sizeof(*codecs)))) + report_and_exit(AVERROR(ENOMEM)); desc = NULL; while ((desc = avcodec_descriptor_next(desc))) codecs[i++] = desc; From patchwork Sat Aug 27 15:19:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37516 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp936848pzh; Sat, 27 Aug 2022 08:20:26 -0700 (PDT) X-Google-Smtp-Source: AA6agR63m2OkJZJEi8JG7mGeiekFmcvzyJROKWFRc+y25WhRsyH2AHocb+a8Yu7TOO3DWykOjetm X-Received: by 2002:a17:907:6e14:b0:730:a229:f747 with SMTP id sd20-20020a1709076e1400b00730a229f747mr8675989ejc.202.1661613626422; Sat, 27 Aug 2022 08:20:26 -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 r18-20020a05640251d200b0043c12e736c7si4172895edd.485.2022.08.27.08.20.26; Sat, 27 Aug 2022 08:20:26 -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=A7rL3EzW; 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 A6F5868A7BB; Sat, 27 Aug 2022 18:20:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2081.outbound.protection.outlook.com [40.92.91.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A705868B9DB for ; Sat, 27 Aug 2022 18:20:13 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=M7n7/hiHdvbvkLUphAywZjRjK+XXkW+7r5NSSwhFudg2s3ZAoWcnRW67TROhFWmJ7PWXfQLxQCF8zsPN1/+9MIp9WrFXzCqbN/Ofvq0AAOTBZ5reMi8an0VDw4CxscmpHdjBo/NbOcE1yN4l3QGIfTrLvxMrCIw9YdqoVXb9QmrHT0uQbhK6hE/hXmzQcBs3bOlDg5eyb+1gjRbYZk0M5kEaM2kh1n0K0CQ9la/FpfkT3MUBQK3KI0gEV5Z4/HJEL2gqO4lUjM+3n/8mEYeQ/hfwFw402swLCmmbcwEOj7oPsDrRn5m83eRaJxD31PmNnHUAI7KudGFXKDIVVX8E7Q== 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=VVrvn4qSPIesj6zgjXKfUgM5IDJozK8p3//fSetsttA=; b=QIfGauIDX1k24RoBG1nFQM/SrQgN7U3jf0lBzhdUz5GP2E77VgqFYuZBKYsWBpFjOsZUJKK1m1ZFFJlNe9SE8DClqFQS5ZxM3dcaYg70unBoBGwtUql/L3sCK7FxUNu3rFEW4vK/7Yuaj4eun19MshWHsqx0n9qzvm1N+K9B4RsgjRU4BmBKmnvcN+NK6QxKeJJMwtoRStVCKXXJA5clP8i74qVAiugAEaQUZ6PozhfSguIJtbjmmcEqHm9RCm0vNDA1nAWJEavHLu7mc8B7sNe3lMGb0nxi/4+IasestYV/+nfG8u1jtE+wwG0nlDzTVQldoX64KCO9UjNeTsXHtg== 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=VVrvn4qSPIesj6zgjXKfUgM5IDJozK8p3//fSetsttA=; b=A7rL3EzWZhJ1cFA+YLgf4J364LVq8mgUj6TZWK1jjpoWL/aW9bDA8l3m+bXxciJRYyuPCBXpbdUkf/Og2Q6owG7rNzoRBS5E2Yc6mCapRn+QcxxPVtZR+2n5E74hAl3Bg+3Xq4xDWdUIDoVBqA6EnA/5pCASJsHG24p6EKvOSW0Rzc+zlAdK01LsfoxZYG5E53AOc7WWmRnnCXyJ9xPXIUlbpEFy+oet/HSdSuK4TbbSXvRGfh714MifwWlh70knah6cpIub8Nvz5Q+K22oLI78iX9XAFv8mmxpqyA3TLPQNxOb4PtVcOidbtgUnEn2gOzJ0mSTxasNE5r69PSz6zQ== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by HE1PR0101MB2154.eurprd01.prod.exchangelabs.com (2603:10a6:3:21::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5566.14; Sat, 27 Aug 2022 15:20:10 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::4cb9:bf7a:dbc5:fe84]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::4cb9:bf7a:dbc5:fe84%7]) with mapi id 15.20.5566.016; Sat, 27 Aug 2022 15:20:10 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 27 Aug 2022 17:19:58 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [KUPpiPz0QfR7/7RYVlvjdChgFttb0cj/] X-ClientProxiedBy: AM5PR0701CA0020.eurprd07.prod.outlook.com (2603:10a6:203:51::30) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220827151958.3004351-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5ce957c2-14a7-4240-99f1-08da883fa180 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmpirIBHktUo1pIdHHWKmY/vstJtw0X4Poz232nHN0YoKzJhUqW2QcGT7NwK+IreyTAeWkGy4GEZPh/zJ2T92lT6NeZ70LC0Vb/wY3/BO2MCeSHftnF4PhY911d8G+/p0va8MGVD01nS/zvBH8ijz9S2gr7sjWgryAfTNdPkKoF2vELtWZi2d27E/CY1+U/Y525/J5L/t2qaf9I48bGzLFyePH9s29yKnODK0r9gY1HRYy9dBVJY6V6yfa6cP7PvCJngAT9d/qv+alcoWuDG9vyRPWufYvh90QJsPu6xu2IVzngA758gEYlq2C9tV8OFJkpXFXeG0CJQY4fxzKVaMBC7uqcgzXNwGpTGemjRqw0ZVvxtweOvsuHP+uOojqI0n0YsWXIFVaMzuHFSo9pULJZoNRc64Cg+TOPF8dgiSUZdzbguE3MVaRFPVVslnFsw9gopB0j++bh9b2uM6XrShiYQIHAzFh+kfTM3p89Qdy/e2YznKPJ3Yqk8Dq4Kk91Xgt4nsl4gk/EaY0ZbpSrMvjrm/wAAKafjXMkL1BCXVD4FhuYFp+2qJdZ4Bnz4cVEmOeF9H8BseBbZWXIV1AtYx2S76CpTDLT3JnGwrUptEeHvhh/pyQ1g4NfvbgzQfdHZYdYV1Tf1Dyy0cH3UCdJcJlPibv1VPuNQU0H5i5L1hSDo5dGYo0jkd4Hy8wPn1IkU34mjWjlDQfdurSnxDQah+Uvneiqv0leYzKGzUjR/ksqeZDTauaSIC0r0KGIngUBI58U= X-MS-TrafficTypeDiagnostic: HE1PR0101MB2154:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lcI8sMG19zycT5OY+VizzW0EMwQdZaE5CsAG4vRZReX4Pmaln3megGkJ7iWQrNAr2Qe85DfNjPQVweCI1cO1aBsSyqa/PgXcNuUU67z6LdgOfVNHrxJJyvjBZhVvMT71swRCrv2gN1cCmXldO89yio9REBTuUy2xGkEmDLIJOKb2Jhznl6uTd5BN/XtSi5PtJFE6NYsXsmsled7hKcdHD29ZwAesLya8mbwXNuOq3Cbtl8FIfR726jVefA/KPkRNp0lMY9o53yoxguk7Ibm3+f+vuEjPttULRBaguSfOpayQKSiEJ5jhiK+85pVuuvdva5uft51cmPUfoosmxKoGis+7ePRetCckT6r/S26u0VKZA1S+ZEeh0XZAjeos+8xXhisVZ20ex36rQ74tGI2KB+P8JehII11jgV3a8AieYvDd/dJ4qIMpi27+E7z9uMf5h0B4cyS5HR8X4gfd9VTzgdIus6vVsAREJXh1ZJvp4YGiFQlA6J1Ou3/yhPDMAkvFswtjMyZEpEfchyLZJcXx6unWrVaUDeWakp/BniOEJXxJHdDoqSFWHedyjCHqTvqAHgl9q8+5a5eRl8ACqoBv5pS+znnNgW03dUW5OIy03Dw9vJrIQZua9iKf/ggNFBLCzvS7pI8iJvk+KulZrDDElA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: PUdhAfgf1Y5v7ydSIkHRrE0KVrdviiFylNUs2nZ0YasRu/qbcxyNbGVQe8LSrSyvILXShPRX02SjUNe/CfvVItZn/ffvYCMHuSzB3fVPt1h2XlxnCr0y24oBYa4ul9EIWm74XCFEQGdWRvZfRNc9YcKNXsK0d1k4QRQwG8Jf0aSnx7dDIaLVM4J9Hz/hnbx/x28YJaX1H1d0D6ZEEncIeJyqvytgEDi0XCGxeU2M0TNLkRZ5P9zk6VQsn2xLIHxBmmTPgFZTHh16Zfl+rZ9qIMdtv5mHJukD9mutIgR4O8TtTI/W/lXTWkowySwMHwrngMmTNOO66RP6eZkhqSb4WLw5Yv3zI5gLEA+n0ZZ/YFIUp7x82ShY+qyXLXNUdqMiMydfocr7m8P1XpT4bs7sBVT5EJqtJCJdZDp7JYPKWGCBQU162WM3zyT/Ah1fsnXlLiKErU+ntYXsRsuO+/CFdpfwczm3JrqYPZaodu1BR0bHxPpKGtuoYo+zzUyVspdXB1B0rCc2+4ibhx8IQUtlmcyeGMFbDBAYOJX7ivl3/X4fMhWwwN/jgrEYuMnO1IONqEkmgv6RDUndmD5uUanZitGjmwTfBJ8l/D3TcatlnGvfiDgSQplVGP6iXQwLs63nLvnmwvzjzOYGOdH7vjp6IV23SOBPwxUODxmqe5ocj/RFKyNGfSpNQC/6o6vV802NPqJ3x+dRIp+KNL72XXN2jCpBw3iQ2q4dU6BJ1GcMizzHbT7CPz8LTBsOeKm4rXHbZe9TAcZigM3CV/CaaJ9RlO2rJvzJ8HD32LWk9boIlF24ZuRLDpLt2SI7oyPRqI3VZC0B+GeLkf0Upu7RTnbYkMV/G450Iqz4Ut0RJKZCMF+GTuWjg+xhQk6OuwhVwnXyCkPk3xJLo9uPVaeyUZ1p38hM5axmb/3nhofras5Bk3kNebRQU2AyRJZdysq14TlG6j1O+groItNgXHSM+evDefLDgsbPqlY0sLyGL9epdXGVelnVK+1dQlC0HVqmVvhHev+ESdTcY7xyJ0UlNamIeg60AYATxD2H7eNpKLNbaTqkFYuAPytUwaq0RC8OllpYzN18rBr4v7iMcbmz8omEA8Q9T9bNoEAtLw+BD9mjaooHPXgkD2xQrwJ9xIsoFLgAR+6r5tRvjXCMJUcnaSnnn8ZLNsKR2oE12ZndIpSdWcHoMBYutA6sTO+QuYzLbjPn2QUMUAUCKFULAHy4/298mrA1VAumXWMaDC2fXjdCh+1pvZNd3ofMSpPeYAFaybjmcgR1wiWRjZ6z9qrkYRoyfpTkxYYe3zHgvbomzvAXTqs= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5ce957c2-14a7-4240-99f1-08da883fa180 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2022 15:20:10.3504 (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: HE1PR0101MB2154 Subject: [FFmpeg-devel] [PATCH v2 3/3] fftools/ffmpeg_opt: Check creation of new program 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: PaKleekdggll Fixes Coverity issue #1512413. Signed-off-by: Andreas Rheinhardt --- fftools/ffmpeg_opt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index ccb79d920c..eddd421b70 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -2753,6 +2753,8 @@ static void of_add_programs(AVFormatContext *oc, const OptionsContext *o) } program = av_new_program(oc, progid); + if (!program) + report_and_exit(AVERROR(ENOMEM)); p = o->program[i].u.str; while(*p) {