From patchwork Sun Dec 11 15:17:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 39676 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp2945170pzb; Sun, 11 Dec 2022 07:18:12 -0800 (PST) X-Google-Smtp-Source: AA0mqf5GhnysQNzXMIMqA8UyuyWoVj2gIF9nnt6IvC5DocBvleYvrkc+csZ5fAM0NGwH3KeLMO7M X-Received: by 2002:a05:6402:540b:b0:461:cc5b:2570 with SMTP id ev11-20020a056402540b00b00461cc5b2570mr10928629edb.1.1670771892352; Sun, 11 Dec 2022 07:18:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670771892; cv=none; d=google.com; s=arc-20160816; b=EpEgfw0F/h5XU+ANyQpK2o1lYNeon5X4opx6Vka3fmdIicvsqxN857dP92xsdiDiNM HtMqSuLZIlIBWpUTyuoLDA+gOFJ9UhF+0Pa0DhMWcfXQMWdjRQPuATQBCBxS0xg0/69o Jbj2lSkxZS3BV8MffSx1EYLd1G1+k3S/FFmNt6GXYvWmgLGu7p8uE0kt3me1mUrQOvDr q1TmxhPDFrdBaPL7EqsstteuorWLA36cKtaeubCnxf8nkhCfsXKE/x5u2JAQzp0Sv60h /RMx3mapQiGsXNwfEBQgjD71jpkovVaQ8pbUa0rzZpJvRNdmDN60ygiftphz+V4MWs6E atPg== 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:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=eD0PbkRL77GAZDIvhmBPzT2YS7Fynh9EguA1ei2Du98=; b=PKgXevMd/Za1tOZoxTHdyM7ZvmGsAGQNmVHN7OBukM/SHdrb9pjYHQYR3zdnM5xzlC bG7J2JNT8aQffN68/onSBJWXvtUqvluWtL1c6hylO8CRzCi9Qi8oSeQSsQT8hOhha6TG aTDuzs6Ely+/GQMhBQOBKkRzK+wncWwKCnz0k5/MHBpi2O6B6+LwL80/cHK3MosuvXRu 0eVaxSg/rH7w3uk17a2NhQyQyc/JnlAAj3YZ5aRmCeWyDzpKQcCjjAZdv5YhMGVUYW8B xr4kevG5rP0EUgNjXv1ziz5CU15HDAsZwwOHASOHYSBA1fV9r8YyTCX4yBGGf3QnALxl lAfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=RnBAK7JI; 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=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g7-20020aa7d1c7000000b0046af5c0f32asi5435776edp.37.2022.12.11.07.18.11; Sun, 11 Dec 2022 07:18:12 -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=@foxmail.com header.s=s201512 header.b=RnBAK7JI; 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=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 294EB68BDEC; Sun, 11 Dec 2022 17:18:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-58-211.mail.qq.com (out162-62-58-211.mail.qq.com [162.62.58.211]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9F1B368BBD2 for ; Sun, 11 Dec 2022 17:18:00 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1670771875; bh=xheLIgy+MOojfmZWD4y3XqSbFTH2aROiRtVNEqX270E=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=RnBAK7JIAREVQjp1+4c9kPVjMdvi4zG6zshbu/83B/wa1F5SF0z9OFdrWhZLzQNZB Dnui6EOfC3G7YSLpKpHm2aZ7lZcBoDSxnxlQDKOgxIV9sqvEjKr0PahkaXC/KHPN8e DAysVAvoy90QJqYpn9rNhtQJstiw+Ufybd1oQyIQ= Received: from localhost.localdomain ([113.116.30.206]) by newxmesmtplogicsvrszc5-0.qq.com (NewEsmtp) with SMTP id 4762AC8A; Sun, 11 Dec 2022 23:17:54 +0800 X-QQ-mid: xmsmtpt1670771875tjlf7s11w Message-ID: X-QQ-XMAILINFO: N26DAMVpW7UEJBvx+nfEk/3q4gxSr84m8e7uLYMdH0b4Wufa+/0/qm3/yqikK4 3IpQ7m7H6hgOPyL+2BVlwx2zg2MjfPqyYORiX9jLw8QNsQXtu7WsLnVVqdjEEC5tkb6oqceD74TN 9RtERIjDGrR63NVOZpd7qyXkkKhXYDZtftAqsGMVuTmrJYyLGVLmBi+XDjmFZUIjStTdtmAGUy6I qGGJiPTXQ82/tt+Eks3DEIAVQSPNyUuOZqyiv/B/0USOEj+t0Uoo5crX3JR0q1qSaAiyYKDPHCWw RfWuspDrg3Lm/iA34HK+Llqy4jWJazdBJWpqBDS+EkiO/Gd87S/PgUL5eo9DwGWWWVasFNlYDFce FkWqkLmKOuJQw0wONR7Pf47agc8tWhlxEqZB8Ocs6cu07jPzcDhQtvabwOITzFWitnaGLvnh4YOI MxwMxvijox5ONdxvsrtzp8WzMxN8BWrP0na2z995sf/U6sWm3wwkMasdbGyNeKEVYcnsFhF8kOdo s4j5g6D5mG1uVj7ibTtzO7g6jlbpvCajDQ1Co0jdJLnjiepHuZMCjz901abTNKqAWl/CT7B4a2Tk FgB3k66cxmSSNkYndxbij6AZ1yUR8sPYAN2YQF5g6hBjDcoBsRJTAdGIekCwCGZ8MeS/4XDxN304 sq+cItwSYMprR0HpxA3m/J2FTH9xXYPFfB+zZ45RvNCbFHjySeGw/DI2ybgpGxfihqa3YcwlQXI3 n/X9qoYu8OfCwS5hYDavH5sQeQh1T9lZ/c9aNLVxtTGAelkpKHboCIpHRzXg8HJKSjtPy0aWJvTj GxMnmf7k+HA5i6ctWgLk4pb1tgaE9ZB8uc699yUJKZztyh8RRJ53HrGw/qCQPN06wQcGCxjXQhOT IG3DKhnXDqMwy2h4q7BaKM2Q/z7AT8sA2AcEpdBeRN3RMyvn6myqpMfwcquUB+wjmaiu0cYJ9SMZ EKt1pNg4PyH+Fuxcx/WA== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Dec 2022 23:17:28 +0800 X-OQ-MSGID: <20221211151729.120662-2-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221211151729.120662-1-quinkblack@foxmail.com> References: <20221211151729.120662-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/3] avformat/file: dup file descriptor for pipe protocol 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: MDmDYw/G30Ot From: Zhao Zhili This can fix read/write error when user close the file descriptor earlier. Now user can close the file descriptor earlier to avoid file descriptor leak. So it's safer in both way. --- libavformat/file.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/file.c b/libavformat/file.c index b8725c1f48..f7ebd52433 100644 --- a/libavformat/file.c +++ b/libavformat/file.c @@ -401,7 +401,9 @@ static int pipe_open(URLContext *h, const char *filename, int flags) #if HAVE_SETMODE setmode(fd, O_BINARY); #endif - c->fd = fd; + c->fd = dup(fd); + if (c->fd < 0) + return AVERROR(errno); h->is_streamed = 1; return 0; } @@ -411,6 +413,7 @@ const URLProtocol ff_pipe_protocol = { .url_open = pipe_open, .url_read = file_read, .url_write = file_write, + .url_close = file_close, .url_get_file_handle = file_get_handle, .url_check = file_check, .priv_data_size = sizeof(FileContext),