From patchwork Wed Aug 8 18:09:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin NG X-Patchwork-Id: 9937 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp1202097jad; Wed, 8 Aug 2018 11:10:02 -0700 (PDT) X-Google-Smtp-Source: AA+uWPwpldsvKt22Zi+UBrT2WUlpG7d9WJv99rCEHtg0M65EkGM6SVqvJiozZfrJPi96m/EuGAsP X-Received: by 2002:a1c:1d2:: with SMTP id 201-v6mr2435271wmb.4.1533751802442; Wed, 08 Aug 2018 11:10:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533751802; cv=none; d=google.com; s=arc-20160816; b=SqDxS/tjB1RUZLR4SKgca6a0LWcXwgLNbEaLFfL3fw16+218m9NoCph4HPwMpplVde tb0e31QNOCeynoH31E20Kl5Bmjv2w/KD0/V1vubvdm9/GT84/bpfdfw+EzqSn/Sv82Mf LgiG2ZcW4uADPZBN0KC23ZIs/7ET5D6LImnuZt8SUQEOm5ZyHsrXrCE3+zW2tvWBNIek 5QHhCfosJ1u7QotsP0w+mjv3GmVQYpeQGNLzR76c13hxcZiroyAlSu9FXFRllFDXDJW9 JZB6HPOp03H1G7TeZE19qqGU+npXqBfPEBiWhVsUkCc2sg0xO9aapyGLxpYGmKrNcppi Dc8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:content-language :accept-language:message-id:date:thread-index:thread-topic:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=1jyUNCDWzSTXaPayXusNdlxlnByple+sPMFvUVpSFXw=; b=RMEQHhjHQHwyAZZDrSxPYV0M7tKCe7WSLo2SNo8EcUeLLGh2m0Q4oCsao5QNi13A+v FwR3M62898Hu9jHECPJOxpNlssavQNTgktpXrP67GnFlPbPRILGThuDyUIVJW5UgG8Sq P8owkAteNS0cnQbzEnrSnOIA4Zfr+aGHQRAmuu5pS7xjJ26rVCBDzd7YzLdZoKnw10Oz 0LmKmDUq/XUM4k1w/QLRDatH3lp4FUqtW7c+g1HMerWKgL1wBnIwk+bBL2EytckCiyIx V4oyFDiPsqzqKVSbyuQTC0SRthNtrtdiIzrrxGop43IiPNxZTnGatRyZ3mezvrCeTGSI yPqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@hotmail.com header.s=selector1 header.b=ucTL8xsy; 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=hotmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w13-v6si3810220wrp.371.2018.08.08.11.10.01; Wed, 08 Aug 2018 11:10:02 -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=@hotmail.com header.s=selector1 header.b=ucTL8xsy; 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=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C4E3268A26C; Wed, 8 Aug 2018 21:09:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-oln040092003015.outbound.protection.outlook.com [40.92.3.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 172CE6882A1 for ; Wed, 8 Aug 2018 21:09:32 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Q7oS6kr5u/1/1ih3NMvS15E11W11e75FUbELuSGEGmA=; b=ucTL8xsyeJHZODgDxPq/3TjWkfnq/aA2YldG+wfKpG9LpSgw42e/SWrdXDUkBKAHzmBBAd49iZbQuoRZ1LBlw01lHEa1TKWFu5sFPl3LPTAyFOzNfi3aWr1xigvJE/BRdUDX5Cvju7E3mxiudD9i54CD4xaaiaf2NeKIkwyCMAhDa/SzvpaLO/+nSP9pHv+DQS35XiQjxso+9lXKlAtLD4XnUxAb7DDS3YoAa9lbL+ztCblTpM6hgT/Zu7+DcW4unwOjBnRWpsfLoAsk62+GgnQViF9wupfTYfDjq4k1Tk5CnW+Z6ua5hzFNPwSA0wmHNTcg8v5RWqtFtDq8aU7/Pg== Received: from CY1NAM02FT034.eop-nam02.prod.protection.outlook.com (10.152.74.52) by CY1NAM02HT082.eop-nam02.prod.protection.outlook.com (10.152.75.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.1038.3; Wed, 8 Aug 2018 18:09:50 +0000 Received: from BN6PR22MB0337.namprd22.prod.outlook.com (10.152.74.52) by CY1NAM02FT034.mail.protection.outlook.com (10.152.75.190) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.20.1038.3 via Frontend Transport; Wed, 8 Aug 2018 18:09:50 +0000 Received: from BN6PR22MB0337.namprd22.prod.outlook.com ([fe80::51e6:d20a:b79d:a79f]) by BN6PR22MB0337.namprd22.prod.outlook.com ([fe80::51e6:d20a:b79d:a79f%10]) with mapi id 15.20.1017.019; Wed, 8 Aug 2018 18:09:50 +0000 From: Colin NG To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] libavformat/dashdec: Add a re-entrance check point after an interrupt operation Thread-Index: AQHUL0L/1dh6sRS/VUusj+WK6ngDEQ== Date: Wed, 8 Aug 2018 18:09:50 +0000 Message-ID: Accept-Language: en-CA, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: YQXPR0101CA0038.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c00:14::15) To BN6PR22MB0337.namprd22.prod.outlook.com (2603:10b6:404:9a::19) x-incomingtopheadermarker: OriginalChecksum:2137DE3069169F1222CF58B1F49956BB6CF83DABD33C0CD8BBA98742CBD61E80; UpperCasedChecksum:E779069958C8076BE24AF15E43504C6CD53A2D563DC7FA7FF817F5A6CAEDE87F; SizeAsReceived:7404; Count:48 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [3QcKpY+Gjj2hw3mSmAPukgWQizQlNPcK2AjbZfPrSAI=] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; CY1NAM02HT082; 6:06hyp5hOR1bF5Hsyhi9lCCCWBAYPi5E4mZ0B11VmgM+otE6Xl9BUx7AIMr0z9KJVFekFRadYY1tvzestrGZO4+g1Ds4+cq3pb/FHQzSOcc1HztGgRtU5Y8nDMo9Oz6dJk+dfK5Idu4VK3AGror+HTZPSmNwZGUAgKbsnw5aLh6vaU2r6mNAFt8herNCOB2eCo3YmvBSHyqUYLf8a966/CIyYmzi5GRHV34H3DM8SUcEIvBJaVlsfIQ9n02xRgU0vd9RDLzwELb5gJU7RpMXPwOSHq+03J9MEkB5YbqsowjRUAEHnyQNG6KiuJKIx12RbN7tJQCv02dQIKncFlzGljGXmH0xwZbI0Hzsfj1lLnN52EOPF3FWjCg0uUxkGA7MHgNUZnTAm+yyONws/rIkUwAqTtb+Hn6IUrisUHFfdIixhZ/ImOLec32ridA27BEzXyCMp6kgEMnLjulB5YAcO1w==; 5:TgyrbELC5iIecNM7wGJiXBap2vHcLikTc59wiqeT9cBF/oW/w+N6QWSA5S69dw8FBcXDfrW8jC/f8TADLZn/f0YQBtv6b+yHT0oRVY4y9hPK97CMuycjWtYFOTeU2L1yfE5LKiYhywhqCNWRvkK/I6/ILDjaZEGpMPC9icP+/4c=; 7:kkRQbWucZyawsv/Z3qzO1kk6R5n3h2S02HPemuz5oGud3AcwKMbYAks7P14x+3BH3PByi5latXLHBY0qPAYlWYOXqDbJqRqSiowQQzZjt4p9fp4ERm7hOmGRcnqihFYGti9lxrR/6XfDJ6d4TAsOTlHRR/SZtlX491u6Wtd9I1JRCqJIiVD1gKp8DsTeaQauj56I2gUmTJduiSiB8Me66UuEdzQi7DvNtQ8D4uuYaFPyF8PwYG+iqg2UYV6rpRY8 x-incomingheadercount: 48 x-eopattributedmessage: 0 x-ms-exchange-slblob-mailprops: gjx25WM8ZNVQabVSt0KIrRBOUEAWjiM0twv6KvUoY8Q4+SbSlzEcqy2ySxbZjPdDlhgQCLso9wc+OLytzfbs1axRnXKY07109bvFXi026a0SmkQtOp7mYeAs0yFXXcWP1uK1vfhKo1exA//RGQhgEcEebIKAG0/QQFtgiZyUd0f8s588Ter/35HcktAi4Ew7FcnoQDu8MxeMrQ0KoJMaHioBv090FuM5RvgMLRNNZ2+ptRd53FqZRjOSqZIlXab9sHywK4G2KuiLB0zWO2YjVousJ0mOpwrdzLUv31nlgQ4XwJd97xSkyz4nmyZD+Psy/M5FUlpkWJ6hnYPdmEmd4Wy+/KvQz4jx2gUIswMpmLibLTyStCHrU8pRD4SSklHr9cLWvzXGTQjFFjEZY7AG51SB7fj2l1Po2YDmMh5R+LWhSGYwgyEgOX+YVNGH1wxyHl903oPB+oW8ZivL1ryw5smVZhstrmz23mCK90oH8bgnqMqiDsbiNXNgh5jyJRNm/Ng31Lma59N/SETs0QC7RXFH8Jw2M9Xin9iRJnjH5L1OlKIbHBWbQQjHpvD1uJETlr7vYRpIT6p9Uef28kDcBQBv+y42xdMm4uU8i7LiN6GBHe5DlIGK3pZvd7po/vDsD0aCaloEU25Jxakofl4VlHU9GeCs9hufKoQ1IyPmx1N0LjNgLLj1MNLtaO74VKT0yOf9xB+vWDEgJUHuOVtIDeEOQ0ndW02a8F0B1ctpDPM= x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(201702061078)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031324274)(2017031323274)(201702181274)(2017031322404)(1601125500)(1603101475)(1701031045); SRVR:CY1NAM02HT082; x-ms-traffictypediagnostic: CY1NAM02HT082: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(4566010)(82015058); SRVR:CY1NAM02HT082; BCL:0; PCL:0; RULEID:; SRVR:CY1NAM02HT082; x-forefront-prvs: 07584EDBCD x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(199004)(189003)(5660300001)(1857600001)(25786009)(73972006)(26005)(2900100001)(4326008)(39060400002)(256004)(14444005)(386003)(6506007)(102836004)(8676002)(6916009)(6346003)(14454004)(74316002)(7696005)(68736007)(8936002)(9686003)(81156014)(5640700003)(55016002)(305945005)(2351001)(105586002)(106356001)(104016004)(87572001)(2501003)(5250100002)(82202002)(6436002)(20460500001)(99286004)(83332001)(86362001)(486006)(476003)(56003)(33656002)(97736004)(15852004); DIR:OUT; SFP:1901; SCL:1; SRVR:CY1NAM02HT082; H:BN6PR22MB0337.namprd22.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: hotmail.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=colin_ng@hotmail.com; x-microsoft-antispam-message-info: rDzELs2PeetHUN/SetE4ukpESJkkXkRj/bCxgi5Vk0UvnR+T1ZBmobivRq0qZqLo2Z4n9Gu36Fw7w2MJR3bc2FLUUtqtfsQZ2d8yGxzBW15PO7Wh062G3AvTKD5/hRItW/rNtRori1Oqe1L5aIKTvPdJUGXnPdsC0OW8xb6jsdfBEuOGAo+8hdpYV+wE1JDlTNl7FUcKczLHmvxk8C0pmtd25FSYcW72xMZRauaobnM= MIME-Version: 1.0 X-OriginatorOrg: hotmail.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 9bd8b953-1c55-4da7-b616-8bcad099ae8b X-MS-Exchange-CrossTenant-Network-Message-Id: f2665a7e-f5e3-4330-4a03-08d5fd5a21d9 X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 9bd8b953-1c55-4da7-b616-8bcad099ae8b X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Aug 2018 18:09:50.8052 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1NAM02HT082 Subject: [FFmpeg-devel] [PATCH] libavformat/dashdec: Add a re-entrance check point after an interrupt operation X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Colin NG Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/dashdec.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 5730252..310dc20 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -1764,6 +1764,12 @@ static int reopen_demux_for_component(AVFormatContext *s, struct representation if (pls->ctx) { close_demux_for_component(pls); } + + if (ff_check_interrupt(&s->interrupt_callback)) { + ret = AVERROR_EXIT; + goto fail; + } + if (!(pls->ctx = avformat_alloc_context())) { ret = AVERROR(ENOMEM); goto fail;