#375 fix use after free

koekeishiya · Jan 20, 2020 · 2c3f854 · 2c3f854
1 parent 8cc6088
commit 2c3f854
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,8 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Changed
+- Fix use after free.. [#375](https://github.com/koekeishiya/yabai/issues/375)
 
 ## [2.2.1] - 2020-01-19
 ### Changed

diff --git a/src/space_manager.c b/src/space_manager.c
@@ -866,9 +866,15 @@ void space_manager_handle_display_add(struct space_manager *sm, uint32_t did)
         if (!uuid) continue;
 
         for (int j = 0; j < list_count; ++j) {
-            if (CFEqual(uuid_list[j], uuid)) {
+            CFStringRef view_uuid = uuid_list[j];
+            if (!view_uuid) continue;
+
+            if (CFEqual(view_uuid, uuid)) {
                 struct view *view = view_list[j];
 
+                uuid_list[j] = NULL;
+                view_list[j] = NULL;
+
                 table_remove(&sm->view, &view->sid);
                 CFRelease(view->suuid);