mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 21:57:35 +00:00
LibWeb+WebContent: Do not reference-count file request objects
There is currently a memory leak with these file request objects due to the callback on_file_request_finish referencing itself in its capture list. This object does not need to be reference counted or allocated on the heap. It is only ever stored in a HashMap until a response is received from the browser, and it is not shared.
This commit is contained in:
parent
9bb469f324
commit
96f409ec1e
9 changed files with 29 additions and 26 deletions
|
@ -562,20 +562,23 @@ Messages::WebContentServer::GetSessionStorageEntriesResponse ConnectionFromClien
|
|||
|
||||
void ConnectionFromClient::handle_file_return(i32 error, Optional<IPC::File> const& file, i32 request_id)
|
||||
{
|
||||
auto result = m_requested_files.get(request_id);
|
||||
VERIFY(result.has_value());
|
||||
auto file_request = m_requested_files.get(request_id);
|
||||
|
||||
VERIFY(result.value()->on_file_request_finish);
|
||||
result.value()->on_file_request_finish(error != 0 ? Error::from_errno(error) : ErrorOr<i32> { file->take_fd() });
|
||||
VERIFY(file_request.has_value());
|
||||
VERIFY(file_request.value().on_file_request_finish);
|
||||
|
||||
file_request.value().on_file_request_finish(error != 0 ? Error::from_errno(error) : ErrorOr<i32> { file->take_fd() });
|
||||
m_requested_files.remove(request_id);
|
||||
}
|
||||
|
||||
void ConnectionFromClient::request_file(NonnullRefPtr<Web::FileRequest>& file_request)
|
||||
void ConnectionFromClient::request_file(Web::FileRequest file_request)
|
||||
{
|
||||
i32 const id = last_id++;
|
||||
m_requested_files.set(id, file_request);
|
||||
|
||||
async_did_request_file(file_request->path(), id);
|
||||
auto path = file_request.path();
|
||||
m_requested_files.set(id, move(file_request));
|
||||
|
||||
async_did_request_file(path, id);
|
||||
}
|
||||
|
||||
void ConnectionFromClient::set_system_visibility_state(bool visible)
|
||||
|
|
|
@ -34,7 +34,7 @@ public:
|
|||
|
||||
void initialize_js_console(Badge<PageHost>);
|
||||
|
||||
void request_file(NonnullRefPtr<Web::FileRequest>&);
|
||||
void request_file(Web::FileRequest);
|
||||
|
||||
Optional<int> fd() { return socket().fd(); }
|
||||
|
||||
|
@ -117,7 +117,7 @@ private:
|
|||
OwnPtr<WebContentConsoleClient> m_console_client;
|
||||
JS::Handle<JS::GlobalObject> m_console_global_object;
|
||||
|
||||
HashMap<int, NonnullRefPtr<Web::FileRequest>> m_requested_files {};
|
||||
HashMap<int, Web::FileRequest> m_requested_files {};
|
||||
int last_id { 0 };
|
||||
};
|
||||
|
||||
|
|
|
@ -373,9 +373,9 @@ void PageHost::page_did_update_resource_count(i32 count_waiting)
|
|||
m_client.async_did_update_resource_count(count_waiting);
|
||||
}
|
||||
|
||||
void PageHost::request_file(NonnullRefPtr<Web::FileRequest>& file_request)
|
||||
void PageHost::request_file(Web::FileRequest file_request)
|
||||
{
|
||||
m_client.request_file(file_request);
|
||||
m_client.request_file(move(file_request));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -97,7 +97,7 @@ private:
|
|||
virtual void page_did_set_cookie(const URL&, Web::Cookie::ParsedCookie const&, Web::Cookie::Source) override;
|
||||
virtual void page_did_update_cookie(Web::Cookie::Cookie) override;
|
||||
virtual void page_did_update_resource_count(i32) override;
|
||||
virtual void request_file(NonnullRefPtr<Web::FileRequest>&) override;
|
||||
virtual void request_file(Web::FileRequest) override;
|
||||
|
||||
explicit PageHost(ConnectionFromClient&);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue