godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #41500 from bruvzg/mac_ds_use_after_free 

[macOS] Fix heap use-after-free in DisplayServer.
This commit is contained in:
Rémi Verschelde 2020-08-25 14:35:21 +02:00 committed by GitHub
parent fe24b7c474 9a85948907
commit b2aae76f85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
platform/osx/display_server_osx.mm
View File

@ -311,8 +311,6 @@ static NSCursor *_cursorFromSelector(SEL selector, SEL fallback = nil) {
DS_OSX->window_set_transient(wd.transient_children.front()->get(), DisplayServerOSX::INVALID_WINDOW_ID); DS_OSX->window_set_transient(wd.transient_children.front()->get(), DisplayServerOSX::INVALID_WINDOW_ID);
} }
DS_OSX->windows.erase(window_id);
if (wd.transient_parent != DisplayServerOSX::INVALID_WINDOW_ID) { if (wd.transient_parent != DisplayServerOSX::INVALID_WINDOW_ID) {
DisplayServerOSX::WindowData &pwd = DS_OSX->windows[wd.transient_parent]; DisplayServerOSX::WindowData &pwd = DS_OSX->windows[wd.transient_parent];
[pwd.window_object makeKeyAndOrderFront:nil]; // Move focus back to parent. [pwd.window_object makeKeyAndOrderFront:nil]; // Move focus back to parent.
@ -332,6 +330,8 @@ static NSCursor *_cursorFromSelector(SEL selector, SEL fallback = nil) {
DS_OSX->context_vulkan->window_destroy(window_id); DS_OSX->context_vulkan->window_destroy(window_id);
} }
#endif #endif
DS_OSX->windows.erase(window_id);
} }
- (void)windowDidEnterFullScreen:(NSNotification *)notification { - (void)windowDidEnterFullScreen:(NSNotification *)notification {
@ -3803,9 +3803,11 @@ DisplayServerOSX::~DisplayServerOSX() {
} }
//destroy all windows //destroy all windows
for (Map<WindowID, WindowData>::Element *E = windows.front(); E; E = E->next()) { for (Map<WindowID, WindowData>::Element *E = windows.front(); E;) {
[E->get().window_object setContentView:nil]; Map<WindowID, WindowData>::Element *F = E;
[E->get().window_object close]; E = E->next();
[F->get().window_object setContentView:nil];
[F->get().window_object close];
} }
//destroy drivers //destroy drivers