From patchwork Mon Sep 6 02:27:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30020 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3373837iov; Sun, 5 Sep 2021 19:29:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxwDH1sWwr8xhCaX9JmSo6jBEPd2U+QBA+5edwBwNM5xFCMTE61mU5J9q8rc3XZcrXRVgdz X-Received: by 2002:a05:6402:2801:: with SMTP id h1mr11071475ede.209.1630895393671; Sun, 05 Sep 2021 19:29:53 -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 k19si7048568ejv.662.2021.09.05.19.29.53; Sun, 05 Sep 2021 19:29:53 -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=ejHpd4VX; 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 33BD168A7C3; Mon, 6 Sep 2021 05:28:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-oln040092071040.outbound.protection.outlook.com [40.92.71.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7239F68A7A4 for ; Mon, 6 Sep 2021 05:28:31 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CwaQ2mHN5gC9PK3CFULd4hAAuIsv0icG+WnqSq6Wbtld7OdHLWA1rYg0ZkPmwM3ivJpkwQPYiE9eR99vHy5Mq2xQ51YAQNkwEirfxNfVDCPBvGIjzkzXGdbqG8g7MEHocNvNw0kG2be5g2XeTezMGGVEk4kOCH13t/fgCGr6QbvZ0waTVhWPa+/Fk88YVYdGy/RIeu52wOKR6vxZSmRn9jm8gYvtCOZdmp/cZLFCTWL8nU6y/BWGc3iP38CZpM5rKMVFqwskIbXkeoREc60LBHpjvyLpmeYUGGAJTRG+wQKoTZ4lbc16eplFv90vlwp4ThDFDOOHeNZqqifwd5yHxg== 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; bh=QCjDg3iMiLN4xFNuXasM6js6QRIpv7t28T4u0pR6LN8=; b=Hbw39pHPQbmaYZXjf7sEMxQxSGIzBizlQBO2BSa5Dg+H6oc6bgfsNDmDbngyaoG02BjlRb1+D6t74EQXDryWdrdpQoVeyTXuOEkA9KUDwgtT/5BlLJw55wv0T9oD8xJgkRoZqyXQ3qFaRoulIxCUWBMJlaLODI8xpUKgvcxibSj7cjZvyaiEKF7n+Jo1QrHif29xLewnptzO8gS4JDz9riLQDMiM6au6LR/UL5LR31ju9Vl/AarkaKhgeMcm3vnufiX66MTfSh4Bmaa4gZIGKQFSgC5HPX6rHSiBsczFhbfWpVrcwf36QABg3VcjXUy3fD65F8Ie3/iiuK2RgmSqPQ== 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=QCjDg3iMiLN4xFNuXasM6js6QRIpv7t28T4u0pR6LN8=; b=ejHpd4VXqt83+ZkOumg9mBoLYlmdHoR/7CTA0Ha5UPQ3gOrZMRh6t75sZ3OrtSneuCcZMkuuoch+fiFt3HH/dHGa7E5jn6VUHfvnP7W4/l7xC6cbuE89k584Y1e3+T5BNH7d5trEimHe450g8gU9xTwY77JA9V2hI0bJrib7ayHwTdExZG4Xlx7LlUlcSttZpHxOi/sAl79xF9rtpo6fyhzmVld5vS6b4JcxT/uQ9cURRE25DX/wpv6pUJz1+Oa/sfotC3ED8oQ8JyCUpX3E/QSHBxKU89b9c53bJ4yKHscqV80Wl6FsdalXNZpQjlk6XL28akZGtzpKUBcgWoMnKw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5380.eurprd03.prod.outlook.com (2603:10a6:20b:c9::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19; Mon, 6 Sep 2021 02:28:30 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%3]) with mapi id 15.20.4478.025; Mon, 6 Sep 2021 02:28:30 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Sep 2021 04:27:56 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [EkH62tljJUtA/G4HC1yzL7vei8PNT7E4] X-ClientProxiedBy: PR1PR01CA0033.eurprd01.prod.exchangelabs.com (2603:10a6:102::46) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210906022802.4072793-17-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR1PR01CA0033.eurprd01.prod.exchangelabs.com (2603:10a6:102::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Mon, 6 Sep 2021 02:28:29 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 858ed52b-0e7c-40b2-46d6-08d970de03d1 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQPQD6tvsiQeosiZzDpp5hDn4yJGfxX7HiNVgzTJmZ2qy71b8Wf8hnpoXmb4KAHyPUV7VCT5tNex1E8qP/sMkmpOicqDV6JePUlztrn5WHEFo5w+L0Gm0hab7ESPpW5iR7WJD3ljZP3jGqagWfvsTj4OimdXCF+89SGptgV3jHgdwILKKRumy6RgFdXWnOq+HVwKKlev7soSJNATSWvkP9A1JuU8SPCbtJHczVxQY8ySX+MWnSAU4/Sbiok+wx/3mwCR3Pj85Oh5J5Fxz5t7vSuCkCMSTbotAbLJdIhhYYDIlJuNCsc4BPm8xEBw1HXWvR1x320vQmnGOsl3ZF13fM7r69p+PAnY226AB2uk2VtJDPSJSMQO8OUvaj6zxkDCmGw3EQHcP0utM0LEhpP/nSwcWLgKzeHuZAN7UeqJCrHin7ZYQ0zBO75OMjwBGsoLTiiECfVoroUcdMtpZ4k0o+Ut2y1xRep3TJPiMzL3/H/V2gyMnnbxLpoHP1//weQ3iD9X3Ls4qqgcRWfQ/oOow6T5BrOlv2+ynl3OGr6R89yAh8dRnkxDqHWA40HVpdZJvzkn8zs0UpSJMgq/6ZLGWuxRNaBwH4LjHx2rdPSV18nI8DguW579c60pra+ZYaQgyhj9Ed4RgnQLohQ+u1wEWUNYIL1HYcKRnTVqKK+21gUIKElgmrJyMYTpaCADplLFdplDMcdOUjSWYPQzbYoWAzhYqh1xOnjUQJH0au8NO1JKNxep47KLWCHNJ5ZOeqeCOE= X-MS-TrafficTypeDiagnostic: AM6PR03MB5380: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4T3rIW1wSiWIxt05L5gKhcs590CH/qyYs5PEEOQhqCN0yjn4Ew9ic/MkSUuGCvAyV6RDBkT5AfaeKdbNLwlqDQCEDR2NTUw4xEGdsDySU/cAwOPdCsmFn2xTh/OkzTjCvqStPaUeel5bxn4YaeWPY5OV4d6q3FgNJEralEsJyIspwsCk+drt/lEoboIVjFr95HeAMvCxVMg6IIFxw7RazX9NS0ZTqpEsl2zH+I7NO+rJNfxD133VuYgYbWtam8fc8X6rdoKK3Hc2Bgfh1vAfRIoFqRJwPjxALAJTlwu6ZBKI0yB3GOTRoRcV26rX/oNMw68FG8cGkZgUhLLFG0LCWXdR7RKY9Z75tqF6c15WBhIIABjA7ROUMhELgtib2FjplcdK8LdF+BmYyg+3PnLwE/hS+TwW9X9dHtM9Q59jqXvTKg8O0/xrB3jCv9sX9Wxt X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: tZdlSrZ4wWILnSYreZ17lLYdciibpVgIDXhxsqdnnOg1dle6H00aP2oXFtwjGCSLVjdUM4MkUUuyh7Ietv5uf7Xyuiu7f228UFywJOYEMpUiPZV1f9FpmVHqjT60yKXeHFUBXY29BPVSB2lvU8IZSw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 858ed52b-0e7c-40b2-46d6-08d970de03d1 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2021 02:28:30.1043 (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: AM6PR03MB5380 Subject: [FFmpeg-devel] [PATCH 28/34] avformat/tee: Unref packet on av_bsf_send_packet() failure 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: EQOdS1sBbKaN Given that the packet sent to av_bsf_send_packet() is always already refcounted, it is doubtful whether the error can even be triggered currently. Signed-off-by: Andreas Rheinhardt --- libavformat/tee.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/tee.c b/libavformat/tee.c index a5bf34d083..505873ce1e 100644 --- a/libavformat/tee.c +++ b/libavformat/tee.c @@ -575,6 +575,7 @@ static int tee_write_packet(AVFormatContext *avf, AVPacket *pkt) ret = av_bsf_send_packet(bsfs, &pkt2); if (ret < 0) { + av_packet_unref(&pkt2); av_log(avf, AV_LOG_ERROR, "Error while sending packet to bitstream filter: %s\n", av_err2str(ret)); ret = tee_process_slave_failure(avf, i, ret);