RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 02:27:35 +00:00
Code Issues Activity Actions

LibWeb: Capture self as a WeakPtr in ResourceClient::set_resource()

Browse source 
It's not safe to capture `this` as a raw pointer here, since nothing
is guaranteed to keep the ResourceClient alive (even if the Resource
stays alive.)
This commit is contained in:
Andreas Kling 2022-09-18 02:15:01 +02:00
parent fa2dd4cbe3
commit 3df9861814
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Userland/Libraries/LibWeb/Loader/Resource.cpp
View file

@ -168,17 +168,20 @@ void ResourceClient::set_resource(Resource* resource)
// This ensures that these callbacks always happen in a consistent way, instead of being invoked
// synchronously in some cases, and asynchronously in others.
if (resource->is_loaded() || resource->is_failed()) {
Platform::EventLoopPlugin::the().deferred_invoke([this, strong_resource = NonnullRefPtr { *m_resource }] {
if (m_resource != strong_resource.ptr())
Platform::EventLoopPlugin::the().deferred_invoke([weak_this = make_weak_ptr(), strong_resource = NonnullRefPtr { *m_resource }]() mutable {
if (!weak_this)
return;
if (weak_this->m_resource != strong_resource.ptr())
return;
// Make sure that reused resources also have their load callback fired.
if (m_resource->is_loaded())
resource_did_load();
if (weak_this->m_resource->is_loaded())
weak_this->resource_did_load();
// Make sure that reused resources also have their fail callback fired.
if (m_resource->is_failed())
resource_did_fail();
if (weak_this->m_resource->is_failed())
weak_this->resource_did_fail();
});
}
}