gtk: Use a 'static lifetime in EventController::set_static_name (#2056)

* fix(event_controller): set_static_name UAF fixed, name now has static lifetime

* fix(event_controller): using GStr instead of str

Co-authored-by: Sebastian Dröge <[email protected]>

---------

Co-authored-by: Sebastian Dröge <[email protected]>

Author: otaxhu

gtk4/Gir.toml

@@ -103,7 +103,6 @@ generate = [
     "Gtk.EditableProperties",
     "Gtk.EmojiChooser",
     "Gtk.EntryIconPosition",
-    "Gtk.EventController",
     "Gtk.EventControllerFocus",
     "Gtk.EventControllerMotion",
     "Gtk.EventControllerScrollFlags",
@@ -1173,6 +1172,14 @@ status = "generate"
     rename = "entry"
     manual = true # upcast to Entry
 
+[[object]]
+name = "Gtk.EventController"
+status = "generate"
+manual_traits = ["EventControllerExtManual"]
+    [[object.function]]
+    name = "set_static_name"
+    manual = true # to make use of a static lifetimed string
+
 [[object]]
 name = "Gtk.EventControllerKey"
 status = "generate"

gtk4/src/auto/event_controller.rs

@@ -147,18 +147,6 @@ pub trait EventControllerExt: IsA<EventController> + sealed::Sealed + 'static {
         }
     }
 
-    #[cfg(feature = "v4_8")]
-    #[cfg_attr(docsrs, doc(cfg(feature = "v4_8")))]
-    #[doc(alias = "gtk_event_controller_set_static_name")]
-    fn set_static_name(&self, name: Option<&str>) {
-        unsafe {
-            ffi::gtk_event_controller_set_static_name(
-                self.as_ref().to_glib_none().0,
-                name.to_glib_none().0,
-            );
-        }
-    }
-
     #[doc(alias = "name")]
     fn connect_name_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
         unsafe extern "C" fn notify_name_trampoline<

gtk4/src/event_controller.rs

@@ -0,0 +1,24 @@
+// Take a look at the license at the top of the repository in the LICENSE file.
+
+#[cfg(feature = "v4_8")]
+use glib::translate::*;
+
+#[cfg(feature = "v4_8")]
+use crate::ffi;
+use crate::{prelude::*, EventController};
+
+pub trait EventControllerExtManual: IsA<EventController> + 'static {
+    #[cfg(feature = "v4_8")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "v4_8")))]
+    #[doc(alias = "gtk_event_controller_set_static_name")]
+    fn set_static_name(&self, name: Option<&'static glib::GStr>) {
+        unsafe {
+            ffi::gtk_event_controller_set_static_name(
+                self.as_ref().to_glib_none().0,
+                name.to_glib_none().0,
+            );
+        }
+    }
+}
+
+impl<O: IsA<EventController>> EventControllerExtManual for O {}

gtk4/src/lib.rs

@@ -139,6 +139,7 @@ mod entry;
 mod entry_buffer;
 mod entry_completion;
 mod enums;
+mod event_controller;
 mod event_controller_key;
 mod expression_watch;
 mod file_chooser;

gtk4/src/prelude.rs

@@ -21,6 +21,7 @@ pub use crate::{
     editable::EditableExtManual,
     entry::EntryExtManual,
     entry_buffer::EntryBufferExtManual,
+    event_controller::EventControllerExtManual,
     expression::{GObjectPropertyExpressionExt, IsExpression},
     file_chooser::FileChooserExtManual,
     font_chooser::FontChooserExtManual,