DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

[fuchsia] Fix use-after-free (#4987)

Browse Source 
We were trying to re-establish the wait after calling Reset(), but
Reset() can result in the surface being destroyed. Now we re-establish
the wait inside the Reset() machinery.
This commit is contained in:
Adam Barth 2018-04-12 14:25:40 -07:00 committed by GitHub
parent b6d2dde92d
commit 0c74fc93d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
content_handler/vulkan_surface.cc
View File

@ -44,10 +44,6 @@ VulkanSurface::VulkanSurface(vulkan::VulkanProvider& vulkan_provider,
wait_.set_object(release_event_.get());
wait_.set_trigger(ZX_EVENT_SIGNALED);
wait_.Begin(async_get_default());
// Probably not necessary as the events should be in the unsignalled state
// already.
Reset();
valid_ = true;
@ -398,6 +394,8 @@ void VulkanSurface::Reset() {
FXL_DLOG(ERROR) << "failed to create acquire semaphore";
}
wait_.Begin(async_get_default());
// It is safe for the caller to collect the surface in the callback.
auto callback = pending_on_writes_committed_;
pending_on_writes_committed_ = nullptr;
@ -415,7 +413,6 @@ void VulkanSurface::OnHandleReady(async_t* async,
return;
FXL_DCHECK(signal->observed & ZX_EVENT_SIGNALED);
Reset();
wait->Begin(async);
}
} // namespace flutter_runner