From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 01F1744F43 for ; Sun, 11 Dec 2022 15:18:09 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E783C68BB72; Sun, 11 Dec 2022 17:18:06 +0200 (EET) 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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), -- 2.25.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".