AK+ProtocolServer: Properly close download stream fd's

This makes the issue of running out of openable pipes in the ProtocolServer process much less likely (but still possible).
cubiclove · Dec 30, 2020 · 6422a04 · 6422a04
1 parent bdd4b99
commit 6422a04
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/AK/FileStream.h b/AK/FileStream.h
@@ -54,8 +54,9 @@ class InputFileStream : public InputStream {
  ~InputFileStream()
  {
  if (m_file) {
+ fflush(m_file);
  if (m_owned)
- fflush(m_file);
+ fclose(m_file);
  }
  }
 

diff --git a/Services/ProtocolServer/ClientConnection.cpp b/Services/ProtocolServer/ClientConnection.cpp
@@ -72,7 +72,9 @@ OwnPtr<Messages::ProtocolServer::StartDownloadResponse> ClientConnection::handle
  auto id = download->id();
  auto fd = download->download_fd();
  m_downloads.set(id, move(download));
- return make<Messages::ProtocolServer::StartDownloadResponse>(id, fd);
+ auto response = make<Messages::ProtocolServer::StartDownloadResponse>(id, fd);
+ response->on_destruction = [fd] { close(fd); };
+ return response;
 }
 
 OwnPtr<Messages::ProtocolServer::StopDownloadResponse> ClientConnection::handle(const Messages::ProtocolServer::StopDownload& message)