mirror of
https://github.com/RGBCube/serenity
synced 2025-07-24 22:27:42 +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)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue