Revert "Fix random leak" (#3609)

Fixes x11-kiosk crash when running on `mir:wayland` (It looks like any use if the `mir:wayland` platform would fail)
canonical · Sep 25, 2024 · c716d82 · c716d82
1 parent 89807a6
commit c716d82
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -26,7 +26,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 
 set(MIR_VERSION_MAJOR 2)
 set(MIR_VERSION_MINOR 18)
-set(MIR_VERSION_PATCH 0)
+set(MIR_VERSION_PATCH 1)
 
 add_compile_definitions(MIR_VERSION_MAJOR=${MIR_VERSION_MAJOR})
 add_compile_definitions(MIR_VERSION_MINOR=${MIR_VERSION_MINOR})

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,17 @@
+mir (2.18.1) UNRELEASED; urgency=medium
+
+  * Bugfix release 2.18.1
+
+    Bugs fixed:
+    . SIGSEGV on input device disconnection #3601
+    . Frame fails to enforce fullscreen on wpe-webkit-mir-kiosk #3600
+    . Chromium unmaximises when focus is lost #3592
+    . Apps constantly resizing #3573
+    . Our fork/exec spawning is unsafe #3494
+    . Revert "Fix random leak" #3609
+
+ -- Michał Sawicz <michal.sawicz@canonical.com>  Thu, 19 Sep 2024 16:17:13 +0200
+
 mir (2.18.0) UNRELEASED; urgency=medium
 
   * New upstream release 2.18.0

diff --git a/src/platforms/wayland/cursor.cpp b/src/platforms/wayland/cursor.cpp
@@ -41,7 +41,7 @@ struct wl_shm_pool* make_shm_pool(struct wl_shm* shm, int size, void **data)
     static auto const template_filename =
         std::string{getenv("XDG_RUNTIME_DIR")} + "/wayland-cursor-shared-XXXXXX";
 
-    char* const filename = const_cast<char*>(template_filename.c_str());
+    auto const filename = strdup(template_filename.c_str());
     mir::Fd const fd{mkostemp(filename, O_CLOEXEC)};
     unlink(filename);
     free(filename);