From patchwork Wed Feb 23 19:50:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34497 X-Google-Smtp-Source: ABdhPJwwgACrr3AD+7EULRTpVqJH18iYSjJHCnES/QT0b3nhOugkULl1pKvNntu1MydVUNIAdHNx X-Received: by 2002:a17:906:2bd7:b0:6ce:698b:7531 with SMTP id n23-20020a1709062bd700b006ce698b7531mr977819ejg.146.1645645882384; Wed, 23 Feb 2022 11:51:22 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t4si258221edr.291.2022.02.23.11.51.22; Wed, 23 Feb 2022 11:51:22 -0800 (PST) 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=p8qFQkBV; 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 34C5668B2FF; Wed, 23 Feb 2022 21:51:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074019.outbound.protection.outlook.com [40.92.74.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1E38268B155 for ; Wed, 23 Feb 2022 21:51:10 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AC3wEeQ3q2p8D57j0eSgBOqRjtXdbT0kIt9WGMm1iXctrX8w9eYBc6qEnRuHM2BbXMbO2qd19WJ3ysJ3VI/ToIoz6eFbCMi/yc4Ow6S2gTiD1hKm2Rc+2qkRYWYmRmJ6kRh/sSa+yY9lXkSUqF1MvVgC0H5FUeGEFDIPHrRnRAyzD790GgUgI01CeOkWN34FzBI/KchUPFn949U5yvLCv0Z9jaUnAo4Foue2Dy0ttsfVAuUWHQoIDsnu1sLS7eJlOJ34oSE7O9zGwSjkm7nGbCZOMSeGt/KAEP+aoNCWMTVVsE9fUo15Dy44ev4HzfppEQHnf2gjOHW5Mi0k6dNYUg== 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=3BqkwRAtWoaSIZRKijkYDYdEcy0BJJh/U4NPIjPXdd8=; b=O0O/x7fR1R2mVuEjCEZscEOy5Oz2cQiUtXsboJ+vUNvV7VIgqUa4ogMQfeQ+TR5qUc9SyUOWuQwnOh3mvOHr0bbYMP/3MZl1PMZa7T/ij21coh8hHZbV1PG1b1jaGohomSTd+/0aNbK14wvLNSP7G9Kf+7Wl2x42/lfQrgTze5h17ST/cmLkonWvBZi5R8tqPLP5OkhV68EG+YZPrYKTyZqM8Wy10ZMfEsg2TIhlcULCzs654vbHd1q1UiU/wZhZqS3Zlqxy/Eu1LjvLKg1QFYXw2fC6Ha2dez97ym/mYpTdXHzLs8/cMxbwyh+EAbFqGcooW1KAZpJKoUPCLwpSwg== 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=3BqkwRAtWoaSIZRKijkYDYdEcy0BJJh/U4NPIjPXdd8=; b=p8qFQkBVZpJ+tjLacDJq0Sn6CRvt26VfR4n6m/7fM3LOCDjkTHSFTRRXw9gU05u0Q+TVKH3Iq+X+WE9U0Lyxb7rWqaR0y9LrCn14mjHoYkBuhfrxgyC1WLGqUnkBtb+nV+1y/83yW0z++spr0N9h4AiguqrePItu4SPqdTrT1bTV64Z+K4lKW7PZZVDA2gkjsE9Vwh8Nc4+OEcs5Sf8nUH4cAHC5yQTV71SHpXDzndj/DJFnSXhwGjrobQkQW73k8v1nPc72UlLAZeHVMSu4rRGNmrO7lxhV6TM0tuL5m3PhXVhTu4oYAK8MSYnuScE7H7yHt7Y4SJByTvkVMWh/Fw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by VI1PR03MB3070.eurprd03.prod.outlook.com (2603:10a6:802:30::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.19; Wed, 23 Feb 2022 19:51:06 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::b8d3:effd:9a3c:4090]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::b8d3:effd:9a3c:4090%6]) with mapi id 15.20.5017.022; Wed, 23 Feb 2022 19:51:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 23 Feb 2022 20:50:56 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220223195056.873792-1-andreas.rheinhardt@outlook.com> References: <20220223195056.873792-1-andreas.rheinhardt@outlook.com> X-TMN: [uQg5ctdbWZBFSnTJDDwvaW/c3UkDkEzq] X-ClientProxiedBy: AS9PR06CA0089.eurprd06.prod.outlook.com (2603:10a6:20b:464::14) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220223195056.873792-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2f7e4487-46a4-40d3-fc92-08d9f705d490 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTuO042wWhioe/P75j96X4HEtOcTfnsYIHIbNx4BpRa9njJZJp8KOl6FmYUCgTSN5cOu/0A5fk68dSBu2Ir0U1ay+QhTlDZqqJjwN1BLYxI2npsQkd5iKIadPP35ZdDWBpMQqFcts0FjUeuz2irm1DOP9v6UOIX8wsE0Sr5LLjl5YaDJwUGzfhXh30MspnEMXz2kC9mg76WWQk1oaqmnqGfJ3mPBGeTNVdo8OogaoxWAcuvp8wfeknS7GVD1GrdwDXcBzp15/aqUd3NKs/fpcK7Yh9ADXdhCNyD1i/Tfw/+i7DuCWKQ0CW9DpmpMKafIzL32Qv3L8JT0FYj/NDJKAUOIaMq5phHDx0NWHZUgw53xUAFT/3DCiJwR8wQY0yDM/CGg+VVyxiGEJIKZxlur2cAYz2sjgfVdg4siUuIiVx3gx74y85C7Nq1BB0IKR1FJKaWt4IVk3L1dr7hbK9yQyl75JrFkHHfYE4Q56LHn6NjO+IcReMZHMNuJjgi0toSdnCo5eeSyIaL3d2mpOp9A8XZ1QBCnNIIL3Yb5wsbrg/2ctuh5tpvBzTb4w7ZOa3bN588hUZuuDgrPQLsBwk2gRZJx3OCQqKJbL7ujgFGyg2QBhJRvuzva4tVYvQImLjw/+UO2vfVWvL0gCL1SBEs2DrZ37H7jDDV8Jy3/N4SEqbAEkco5UcodXmNwIxZyExevwNt7ASEUWU4dHqhWhEtMgr4CFycTGNYMQlpzfB7efQprzcxupJLdF0MOko6gYs0xRg= X-MS-TrafficTypeDiagnostic: VI1PR03MB3070:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: s+wmFJrJVkZgcb1ExgTrmRrR7EVAfDOiAMSyaGRxCYqsHxttm+Bx+LFIYsi8182DGIaLClSslhJqD5QreAirS6QpKpETvKOtcMtvX7+xVUzui9dNNnUeBUfzW2uTTrhJpLj+7imu7R76RONLgVnBXxd+CR9g37SFKCQ5J8NstNSrkUeMSJR7SMjWNVU/dEGu8QjpHFZCWmQm8nvvDpvtuhxHgmwMjRxEDEjpI7fJ/IKHdNK6P4kOCCLZl+EMHHPv/bwc3qPNNVAkyPfjVN1HT9VEjDIuMP9RxNsnxPsop+TOIvfthvJj7F1CY8EDHNb2bBpk0on+0+jBVWng4kuQiut3JDepl37aYhBQCfmSoEi11PzKL2IKbsdbQPc476aYgbWoZ6tVvX8dHEXnnMbe1paZdY2N0C32oqrf/t+QZSVQPhanW0KgGdWdvQ9v4NJyG+kf+kIWvQzNh/Lo3exDQ1AIREsrQNbPm5weMQWjpQ2sZVc7k09GeGTs3pvXIkawTRFaMQiHnVWMExh/o6VrYS0vXralAn8Axvso8ovlsP3BozTRU5YtwPCK2CUyN4j468d28PFFSg11g2H0OOyK9Q== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wuSWGfhkC1khixpnIiN9wfJQ4AxBuIAtkv3vCXF9br5OoNlTzNOjFx1E1bZwPFVkvYuny4oYPqOx2B2aEha2wD6B//Hi1doJORXikZs/fZG5Zwa5TZRFTG+atmOw8k129mmvYFEos1hEgaG4vu/OxOaPn6N4pQOqivSmB5A0L9XlIIvzgJr5r/apDR/8PwV31dV+C0PSiAapBSAifCdwD+Zk7sdpQZL30WR6XXDtOxoqQYk2zMWQ5/XeEwprhXPvmPNp5m7B4JsGxm1b63zNW0LICkRC+11P6Ps4OTcH2LxWLW9VZFryVDEJv9Oyn/hQ0nQX3hFGo3Z+nslfEr7zRcHPXdGxainjuzUKA0cm1/2HMYiEyOlQ7r0c6GbCbLDcOQAJzf0cx4HlRfi/7syLf7Nv/bq4qfo3NmtiEOhjSubW+iNLIrp+bchmOtOHsl5nX0l91DU0iz4i2XpMKFwWmqTOratwC3oudTkVOqlfzVuteikhvfkuS7byx7QKyWeu3tSpT7d8ZTo0Sr5nWTZxVOMMxwd60KC3wVfkoLlv4WfDSRBLlFsmEUxv3WhdijkDjZNYt6yws7i/xo5GsOGe5SMyKeC/iizyKgg/ZdM7JqO8JvHDsQkbME0PlSaEGhOvn6xwm8ojfd2JJd16FdK3K6QPl1K1e9iiK63fIbblozIwi443YoY1qJCbDhNZviPHQuLgzFEnB75tuuc1vVM1Ik49KKBSsKBNL8zIHn6PPgM95VjowWQdDBfgkxKCKDNgtT+KmQPImzzujHBJkfTl6OCfOdQJNNMikHiiXYWBNZEIE3jjiJAM0cywFG4iYqAnsgEVvgGqKRzlUPuHwVFKRyGXYF+YmZPqtleQasILrn9fq5QnftFDGA+5bT5q2P0h5JJVqG4dASYT9TKmhCBetgqsmodqOd8+vLxe8/fRKdTqKrqNc5uSphnW8hbx8W4Y3hRbUn0+TTDBGsgluxc3Xg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2f7e4487-46a4-40d3-fc92-08d9f705d490 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Feb 2022 19:51:06.6085 (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: VI1PR03MB3070 Subject: [FFmpeg-devel] [PATCH 3/3] fftools/ffmpeg: Don't presume frame_queue to have been allocated 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: 9s9NR1aCiUnG Fixes segfaults upon allocation failure. Signed-off-by: Andreas Rheinhardt --- fftools/ffmpeg.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 7beea11933..e9de8fb430 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -527,11 +527,13 @@ static void ffmpeg_cleanup(int ret) for (j = 0; j < fg->nb_inputs; j++) { InputFilter *ifilter = fg->inputs[j]; struct InputStream *ist = ifilter->ist; - AVFrame *frame; - while (av_fifo_read(ifilter->frame_queue, &frame, 1) >= 0) - av_frame_free(&frame); - av_fifo_freep2(&ifilter->frame_queue); + if (ifilter->frame_queue) { + AVFrame *frame; + while (av_fifo_read(ifilter->frame_queue, &frame, 1) >= 0) + av_frame_free(&frame); + av_fifo_freep2(&ifilter->frame_queue); + } av_freep(&ifilter->displaymatrix); if (ist->sub2video.sub_queue) { AVSubtitle sub;