From patchwork Mon Jul 31 11:08:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43043 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:ba09:b0:130:ccc6:6c4b with SMTP id fa9csp32413pzb; Mon, 31 Jul 2023 04:07:54 -0700 (PDT) X-Google-Smtp-Source: APBJJlH4t4JaGgv7LSL/2l2Ghy+pUKO3wP3N2bBf48Ni7eT/vkW+at8/Q0FOrrTjVZ5Z5+JCFm/9 X-Received: by 2002:aa7:c68f:0:b0:521:7779:d918 with SMTP id n15-20020aa7c68f000000b005217779d918mr8241707edq.19.1690801674215; Mon, 31 Jul 2023 04:07:54 -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 i18-20020a056402055200b005222831c8a5si3039402edx.329.2023.07.31.04.07.53; Mon, 31 Jul 2023 04:07:54 -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=Rtd9UQX5; 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 5A79268C593; Mon, 31 Jul 2023 14:07:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02olkn2066.outbound.protection.outlook.com [40.92.50.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 66B2E68C31B for ; Mon, 31 Jul 2023 14:07:43 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=du1vwM/XbkuUKbJoFQHFUoGZZrE+udZA2Q54aHMPcH7/rnwpSpEpX0uMJhucTgyDiIQLFkR03ULMHJaoE0Kmz8NQYF/yI4lYrWbWQ7vQhR1OsaCgO/gQIguYj4GQqNjkTY4b7MtgGMZfftwHyuIpGmE6rm3e7bXdoKojaO33IhkdVTcAyJYjRL71VDHjuppwc/T8M5p5TpOh0urdtHH4laanOBHdi7asdI5+2rKeIHfMW1/wP93UvVEXvlPgq0+z6q9+WWYCAesU+P6RBVr83Cv3gIS5WeeuIKDmhVy1O8o7ua8wAArgtSCwbxmlGKDn8Qrp6UNuuy8Vrjogvyl26w== 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=u7QVSJpinrphKMSA9lFgzB6TA6TPvFBbFEZ4Zf8WVts=; b=G8vAURLrpChE9aHjJDRvmRTMnnxndaF9srj/vNBG0tai7xljYtF0afGkfLK82pKA/5p1Kya+Bgn144XlMFvRm1/AOeFuFnWkJOjVDSd1xIbtinPYrphDTY7CTQOMVzzC9VfooF6NIXNwoPl+046f4WeijdhzuOu/e3vGyYKzuqpJlRbt5cmCYIjumcTnVKCRr34M2wbBtpkSHQcF7S0UkwemqXzYMkihgB0HeoBMq0r7JGz7i1DrqNwFJenThljYFQxkt1FCSN+8mf3HBJ82MthSKoLYehK2cmc11FJrfJch/UCnfRF3xlLDxzRxidBieZ9tlk2WBhjbbgguz0/Fuw== 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=u7QVSJpinrphKMSA9lFgzB6TA6TPvFBbFEZ4Zf8WVts=; b=Rtd9UQX5noL122OrQJNebaUlxqZytlLipCMlHVTf/YfcrWc/qNO12vbfKqBXI+8vq/GR030mYXigFQqmlhD80CfF0LQrmMaYab3P5kS9VuHsYOHxq88O0Gb+qBIDt9SqvNJtbienEaMJ5XDwnwzsgWbdpuiekuwnDy/P7oFidQJWUIH7Ud+UbXRX/clFRLiSkBpyu+CfxQFmZ1seszv575B3GwHbRCk5rJZQJDZAfqtbxf5LupZBV/apko4Zy8z6UWmWV5ToZojFblX73gkEtujuecuKKlpcqvmptjY82sVbF1yDX0xNRKOBeZXOqazH2qk3TLsAuVdL03T1vyo5aw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU2P250MB0271.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:270::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.43; Mon, 31 Jul 2023 11:07:41 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4d3a:7ca6:cf28:9e8c]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4d3a:7ca6:cf28:9e8c%7]) with mapi id 15.20.6631.042; Mon, 31 Jul 2023 11:07:41 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 31 Jul 2023 13:08:37 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [w7nbV5a9ZJfhHKktuG8tbJMonex6/ArASm2I/4RLFvY=] X-ClientProxiedBy: ZRAP278CA0014.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::24) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20230731110841.3312997-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU2P250MB0271:EE_ X-MS-Office365-Filtering-Correlation-Id: 5e55e281-f0b7-44b2-8fd0-08db91b65b8e X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKzjKmSUhrFaThW6kVSdPParY9gyO/DglvQd3k9g+LabdnyXR1rIkBqvU8yGRvnun1EsJh76TQ7unNY7HlQYsDqN9Zk0826jzukNnXs2TL7L+HonG4b8/cFzRj6YBpx0n4IlPz5P1fYJaKy671tpQOMOK/ILZawkHa1D5c2vgTw1ZqoaHyWghkYgl7XgHZoqvYDJO6zxp4wuTxZTJIeAHaHDwHYdx9/FMnkMsv6+TdUdLxk0GuBK4QrnMWjSaCDJ6iCBl1Jo/ou2gS6IWCb4Hs7xCaMUdjt9xmoqxFhChovw2MsxxeyhSTsqSaWMsQJi9FqnMUT9TUxa4+6WkPs10YkbJEI1a6EmkqLz/O/iyWH6i9XCimXpvdZ6rkugoqIBHK/qoC8vs59AL685ew9bQsQzZBMd799sNbvYVSrqZgGDU3eStvMBnjFBxugIjPEo5PDzUNpEM1jECmK35/i3XjlU1hdd5qaM9YXAkC16ihewQpu1CDIjTN9mm7M6SUkn1QdPU7eFSshvSCVF6SBzDQRCKlrLt3zDOq8Hz5MRGpgHLli4GbRWrajzh30U0AkuB+bJDmaceG9Ob2ALcIO+j16ENf8AxfaK8jsubATrIfSBw6XIp88XBkmYyFcrS850tGQFewBThSBhy1NVJn73a2CG2AXWt8t0qjX5Dlh+gDtnsdFTEnKNprI/AorEgQV8B1blItGFPUm8mi/6k7lNRBjYgpou2kZM/OE= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wDs3pz9NkaNZVTqPUdPe3VC9+vP2kwHAjeCjNN/FkOE9SHL5Kc3aKgwXXUEPUj4Ctd60OgoQYxrRKuszJnML6izn6RxROYEcWqgBkUQOKuukN/bCljRZlseX12KkhGnoDM7yRP2XFA/ItCJeNNw0wEA3pwRd6+uvRkRh+Dxn1fGsODexEUdBbMd01vlYf3t+pBDp7XLg2WD/qVvsrsbp4DrZ8vDUkYWu/nvWmvu65GNOLGq849LHex+1olbE/XfUuhyrTuBSVAw2Bay9dNUJ8nYtdIglXXjXYWKypaBb5zBowLxk1h6WMJNNltFp88OrD8kYhr8tB34hypry7x3VgZiIbbdI2jPkxWfvU46WAdMfn4PFoiVnmzwYQmnN13iYDjy4F29msNj9dZ0RzYcQwG/YaqiiX+eDUWq7Has1YFcpmFr7zPv0YeQN6W2zzBokQITrlP8wDDnlPTtTE5e/8Nicx1raQs4te4167NJPoJaSaOVRMXiFygdi5wzaoVBHkQ+3z+2Duj2SC6aNTUR75QMHkmT5oztb6LkmBd4dkjodN/HVosWuAcQV+tdeaqYtl2RkClhC33o/AmhJVeoG16b55pD5FlHf1ijue67yS2spL5xN5jqdO+tvu4p0qZgH X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DyJXWKENDBzfju2PB0nwkAnQBx0q97xzfRmmwr6dHzT2RCzU5vRmdMYV+Id/+WoNxsCTYinsKV6fK0De83Yn4K+wAm+tQwlsT5ZCrUYu7yNynOcLlYY4gpI2AX+Q9EqUwBg5WzDZQ4YzSHwdTcjJ4MdevCnyClHvxWmDc3iUi1hSDoq4Co+BVDbiQFeNiGr9oKnhMTdNRsoqqTzkSge9+aEsIgT66+Hhlhky8fI0wcAlIObGSVjnlbpyB6R5omZ9nupTgsn0TUoviAXSkPYKUGaRDyAW+2hHhy9SFwuktC0fl4gMIQrpXvCIWRBafY5b17LjVOMCkvmh32VwHF4s+2EY2u5D5weqmR6zr4Rv8A4mu5xLea9a4Tb6HKpwwmrjxGTwF0Hc3kW+2q5ydK9AjlOrL2y/7E/vqGTXl0CVnBcmzp0stRRiG0wTNGu3WTl9O9qZEhnxAHUoQHFKeWZrC9hCTDs3NV8rNP9eb44ZIwmyNPOyC1S2ERyckXz56n6d5LBzl8mzekiF4W+YFGGHu8kJ2GQjDqGMFxaOIPHHrtcdx6Zev+IpfPvcwnkI8oDcaRjOlYzIxKqaCnLjz48JaaFEfPo7vk40V45FG2S/rKbin8GpbsAY8v1fUHXGSaWL0b0D3aLkwukEe5U+KojObVGEjxxvjdBCgyTWgOdK2pU6+5i5ksYGFqNNycJXL3QsKiCu547GDJNQRYvn7vjTa6mJo8XdCQPpPocbMjl7wwDLy+kdMLoudYWdgNlMmBfxe2j1bCsJhEQ0Wr5d8apz5JJOkiX0r6i2AwMXCvUJkXAeK28aXCSKQ4ymSNk9Fb5QCSYNwekoUoma++EyT/1ZSyiUVmWhrQvK3OzNZvWC2YSbfdD0p0efLZZV2C0xQa7mX569MK686lxcz9wXsf62f3b4FyxKmaJcKEZsY24JpAllenW+qDuhHkpomnWeWCbANGh09/c2vuurVS5WjKj8YfZHbjXqFYBqTXPoysKsRxj2cJ5rR62Zcjed/GXwhKmUEm5cWaInMJU16nxvM24k2gc/eVMp2SLB0YD5Z2GUMGSj2Ky4C5ieZeBh4bgvdNm5lZ1fQG0yFyY9K6xtH8GL0rb8btFuBEdY7xWzYEXASt4FftBqVB5HbqNgVIkMtMJk8i5xbQTLS4MamoPBdiGi3GcdDvqtUOz5mTehGBizBio7a6U9v3VWDTwXwxg5Giz1TTW+i6hXrATivafQvd4jUnIiKAADeIyB/lxmV8/AUx6HzWv4OSPBupUJ68f4PCuM X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5e55e281-f0b7-44b2-8fd0-08db91b65b8e X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jul 2023 11:07:41.2774 (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: DU2P250MB0271 Subject: [FFmpeg-devel] [PATCH 1/5] fftools/ffprobe: Fix memleak 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: srZq4VuRlIiU Fixes Coverity issue #1524491. Regression since e6126abc6997058ca49ee596b70611bbe367163e. Signed-off-by: Andreas Rheinhardt --- fftools/ffprobe.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 81610c097b..5c2d4cbff1 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -2929,8 +2929,10 @@ static int read_interval_packets(WriterContext *w, InputFile *ifile, FrameData *fd; pkt->opaque_ref = av_buffer_allocz(sizeof(*fd)); - if (!pkt->opaque_ref) - return AVERROR(ENOMEM); + if (!pkt->opaque_ref) { + ret = AVERROR(ENOMEM); + goto end; + } fd = (FrameData*)pkt->opaque_ref->data; fd->pkt_pos = pkt->pos; fd->pkt_size = pkt->size;