From patchwork Sat Jul 13 14:22:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 13928 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 580CE44A132 for ; Sat, 13 Jul 2019 17:31:11 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 346DE68AB81; Sat, 13 Jul 2019 17:31:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vk1-f196.google.com (mail-vk1-f196.google.com [209.85.221.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4523268A774 for ; Sat, 13 Jul 2019 17:31:05 +0300 (EEST) Received: by mail-vk1-f196.google.com with SMTP id 9so2664059vkw.4 for ; Sat, 13 Jul 2019 07:31:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Yy/lwURxN/qY5/tB397P0GOE2JVkdtxHVWb+N3Z5kBk=; b=mXBAxvWqP5XiypN/FZpT0/1mUhHmEdJqZleomDgKZ+d4aBVaz/5cgO4Nokt5KpWo+a +44Ddkhb8GLeEHqa7eWXn32wV81ZP3tTE35AQTYJfBwy/rAdaxzfSfq+K1PnoT4lGjbG lwfw1pKVPArrbpyjPfU28AM3ZDWVncoyxBxWXdEuBCxWphU4eff5p9wnCZhKjrSrnYCG ats79ZJfAzaSHT7+oBS1AUpsZypSJCJM+EtwMBlTJ5asMllxJskbDP1/bWYrQM6Ms/GU jhtodxuzfIjI7Tb9feCoL/R94T87Xn/G+0HR9+IbBTieWpl7k9HCmwrRvWnieE+edmFF k+dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Yy/lwURxN/qY5/tB397P0GOE2JVkdtxHVWb+N3Z5kBk=; b=EeXHskvC980A7NpWlCT39mOH3FfYHI7XHC3X+UKNzMPX2hHkMlHsgHQPgttJKAU5XU f+VYPCqXWXGxq9TnDJvK1NGy4owSc1FIGOOkEmeuzbpb59LBkJ8e7eF2R5cSPLDOC+CF LbVAOaGDWyyoxpN5ZE+U6w8MX+dzmMmmuiHtsHTtbKH6yHFmX3MxVBwClOpC8qioNcOH s+jI/dh1V0l+4wYKkzXC+Sq6rTsBlCRGB6FHuFXxInQ+ZAE4AU2hJYcIfMX/HXJhKHq5 peQenCAkeB5mrNbx6x2JMCjAJwZBffU40T+RPe4hvW/FhQnaC73zNLdFZD8dxBGKae73 stlQ== X-Gm-Message-State: APjAAAWaTJtjpq1xdxYrumfKaNFMUur8qtSTYC7tIkChU1bX6ZbVmTe1 DpTbet+opvNwAoCPqeLgEh8PAR0M X-Google-Smtp-Source: APXvYqxliNH4sk/9VJ6sdZYQsm4QSTAYVN5kM2aS5AbJeMBQxr/W6H1Ijz60XhlSaQeql5Ns9ZTVDA== X-Received: by 2002:a65:4546:: with SMTP id x6mr16886186pgr.266.1563027784174; Sat, 13 Jul 2019 07:23:04 -0700 (PDT) Received: from izj6c97garwn1o4y2zidq0z.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id u1sm10377700pgi.28.2019.07.13.07.23.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 13 Jul 2019 07:23:03 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 13 Jul 2019 22:22:57 +0800 Message-Id: <1563027777-17411-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <20190618104513.19549-1-lance.lmwang@gmail.com> References: <20190618104513.19549-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2] libavformat/avio: Fix for the unexpected file close which will cause fd 0 is closed 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang By the code, is_connected is used to check file open or not, so after open_dir is done, we should not set is_connected to 1, it'll cause the function ffurl_closep will invoke the url_close and cause unexpected file close. Signed-off-by: Limin Wang --- libavformat/avio.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavformat/avio.c b/libavformat/avio.c index 663789e..8b52aa3 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -560,7 +560,6 @@ int avio_open_dir(AVIODirContext **s, const char *url, AVDictionary **options) if (ret < 0) goto fail; - h->is_connected = 1; ctx->url_context = h; *s = ctx; return 0;