From patchwork Thu Oct 7 09:31:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30959 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp1284352iob; Thu, 7 Oct 2021 02:32:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyCVYTbfL7bOsHEgDCgrIH5uRsjKV7MLL8s1jQMCWYy+QSdDCNGfKIztTG+0LIYEOY7Kdlk X-Received: by 2002:a17:906:4c4a:: with SMTP id d10mr4501526ejw.391.1633599141781; Thu, 07 Oct 2021 02:32:21 -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 j4si23064815ejm.726.2021.10.07.02.32.21; Thu, 07 Oct 2021 02:32:21 -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=MEZ7P1wt; 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 DC7E568A4CA; Thu, 7 Oct 2021 12:31:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074015.outbound.protection.outlook.com [40.92.74.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7159A68A32E for ; Thu, 7 Oct 2021 12:31:50 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Grbsk4B2oYkN1/6HT4PlPlnausL++tm0RxXD3hLQPFVniJCNa67GyWU+HjBsOL3cnMpnLdtEj7EKMeDYrvDJ8+9bMRpgimkGV/Rby70dYsLx3BJRNSHxwC6eqv6uC6Bgy/bPyBYiqxbW+if4F45O8a4Bo0vUgUZ6AI4pIscJ1pNfvk3XP1GFoUE2Ehc/cuFWYhfPdBtE/WOFLrkVNY5hzjWPciZFQV4mpxB/d7Cfto8QTbobVL6QpOnv1AiH/2p5xVu4U7NB9EdOVq4FkiOHfeyylS144wRxw4Ka1aeN9k0Wl+gmsRcBgz7jS9pN89trAEamrMPHNWk6kUqj7JYEIQ== 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=JMitidBs00mep3W5+AwWRQuIIx6j1vIZMVWKU9UO36Y=; b=XLqDboVFDqTbSb4Uc2lLXcLAcnFmdcww5k1ts+RlneN7dgM4zquNPVQkpTMB9a5sTjFIR+JpeMziTAk1/oiATBqDZ1muDSwZT5jAWek8PWEildDOhOIDZXzhLFmM+kH/UufYsL2I0c3jhQJWWeMqot4B9E8LMcbEDdm9j1oXYYty4br+tu5YR+KjNgBKt2GhVKiDy1lcRY953P1WenxZJrLhigeqInYIb+6UUm++n3GqGaMSmGr/LgXtTiLNbUZ+jk3Hd3txDgiPPrx3OIzHJiGli9XZ9vc6tLUQqmpad5q2GtRaoD06CCXquyNf8PMkSqYKw6+1pMNU0seYMsyqFQ== 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=JMitidBs00mep3W5+AwWRQuIIx6j1vIZMVWKU9UO36Y=; b=MEZ7P1wtZr18unkuxr9wJGJGKxBMmiPo651u+g8+ThC8jkqNbV/LlUfmVouatfNUXNao2z4iJKMsAOswBgvOOCnfYDx8wIQa4tn+St0XFutfnNzDjlRpIphoUjf4XDz9jHKTV/QYlznRKDiVkAIyruIH8MVW7vjE7mYJ7BTFmSYVl+S5KJL50fhQ2RdimrqoXa6SzJhBZ1HdbrSrtvRdNZY/PO/PGOmArPSh+YWZbxcKRf3z8xjitO39Pqrtog7ufJgDXWX7yH1XEUJiZzk3ydM+SM56F9D5RxjavxtIXGj8GwZ45xDO5IhzXU5INAMAi8g/Ak7fbi7jIwm+QIeGFQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6325.eurprd03.prod.outlook.com (2603:10a6:20b:13c::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.18; Thu, 7 Oct 2021 09:31:40 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%7]) with mapi id 15.20.4566.022; Thu, 7 Oct 2021 09:31:40 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Oct 2021 11:31:25 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [c17XJZQAzxBmsXKxL9OWfVhwwUSjqEtN] X-ClientProxiedBy: VI1PR07CA0161.eurprd07.prod.outlook.com (2603:10a6:802:16::48) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211007093128.684774-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.49) by VI1PR07CA0161.eurprd07.prod.outlook.com (2603:10a6:802:16::48) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.16 via Frontend Transport; Thu, 7 Oct 2021 09:31:40 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 19a0ada0-d2c6-4c00-d0cf-08d98975447e X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiStnrXejT7dVM2UBhIQPPsKDAy5EmDpYHqXaccev9XdnS92gs5sgSKTJrCVdOhORr6mRcTYzTcmi99XT5KqYkaZ6SRC7XDkmsSLUkNY9TSyLy5neHYDAQpl6uwG7/bqGylnuljupsnVW3IEwJMTcehUWnyxepqBSg4qNEIYQGUvd/plXVlbrxj819MSj9wsRIaDlfgiM9nAEh2i3bQPdju935FojfWBhZIli9UFzo2sOo/59JXoeqNegmUX9GXkOGDcHVWf2bvy7K3/uiz4k6PDwfVvrgxtJM+Wbtu3KbQuxg7rgtYN7PFwkyvGnPB7E5s2x834qb1TTOFPFN9yTWI1ZSFaj62Msdm6/2cj0b3jIm/EPZZNq2jG3+jiTPrO2gxiSDVBeRRcVhZ6DS7xgdAEyZr57hCceSvTrn5e/hx0d1UyXAPUNy+ybCUYFpEqkcm5X3F/rRUeWJGIIbvOEwDrfhz2e/eMFAUjU2bx30yN+eP0a1+MN+M6wpbVKxF7uacAeKaaS7y8vT01qL5AIzlReY+9NzjmNBPUjkvsNBW/ewvEoeXz/CgZKFinlBnM5/78gc8wwM0qU8899wVfpMevZr/wCAMS/lpGm1kvtxheQUjZZ6PVM8EqggoXsNrG7tB7XnN9NKO0BUrBVBpKqQD3aFFTcNlivRrhR4U76ehyc9t9K3I0P4TZloVZrBt6LtuPsMbxwgrVnXL3RF/ymkrbg/sbh9ID0jb4b1fSnPzJDhV/lZu0NZHD/C5wn7rGsKY= X-MS-TrafficTypeDiagnostic: AM7PR03MB6325: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 14kZhHkcxzPcCjPEj7O5vz6N0/s23s3aheok3VuCIXoH9yfRKD5EbOmG5EX43fia36gaqmCnuzZyhkVKelKJhqOq0IRQKskmh0Nbd8/4ztsWfBtVfF84RTCkPNCRnk1QYNEuaAlTG1cGBctEBU26pEad2g1FHFt5GFxAixdQV24djD9UDHwWT+iQGWySstf2/ch5SlaVrbeL3we2k+Gk3LrDGtiHXn9ASYC31FFiVtv0l2Qi6Q2o3yIyeqrGYaHGd8SPmj1e4aM/hXfv3BEwV719HtKRLH/eaIqnaz5GncAdeFW+NEYbKUenrrbvVej4F5w10llrSVeMaYhxXVO2iAy1gjpalNX5Ng1OOSNmMAtfWb84jyOCbueg7tc6JtLts3jiCDEDgcOPL+xjs/7QHVSKrVo5zjbWOeB7ofdLebYttwE1wvD0qmVluT+iWWKt X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8qOUz8Dae4fOQbasdf/8EuPHAXwhXuB47GpSjWfhwNokz0k9yGTaTfbsdEO5zyUdnHCz0kS9h+6YXXG+QRf17lrBo3cMtP4l1uFqCo9AZcCwPrJVfTdJzVuFPXFIvEww2BfhUT9KBcuvZap/LCTZgg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 19a0ada0-d2c6-4c00-d0cf-08d98975447e X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2021 09:31:40.5385 (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: AM7PR03MB6325 Subject: [FFmpeg-devel] [PATCH 5/8] avfilter/asrc_flite: Don't segfault when using list_voices option 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: H7QXy0TFs1/+ Could also happen if initializing flite failed* or if an unknown voice has been selected or if registering the voice failed. *: which it currently can't, because it is a no-op. Signed-off-by: Andreas Rheinhardt --- libavfilter/asrc_flite.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libavfilter/asrc_flite.c b/libavfilter/asrc_flite.c index c861f5c238..0789dd6ff3 100644 --- a/libavfilter/asrc_flite.c +++ b/libavfilter/asrc_flite.c @@ -196,10 +196,12 @@ static av_cold void uninit(AVFilterContext *ctx) { FliteContext *flite = ctx->priv; - if (!--flite->voice_entry->usage_count) - flite->voice_entry->unregister_fn(flite->voice); - flite->voice = NULL; - flite->voice_entry = NULL; + if (flite->voice_entry) { + if (!--flite->voice_entry->usage_count) + flite->voice_entry->unregister_fn(flite->voice); + flite->voice = NULL; + flite->voice_entry = NULL; + } delete_wave(flite->wave); flite->wave = NULL; }