[gtk+] x11: Don't use g_hash_table_steal()



commit d78bbb7e96efcbc83a8bc0ea71f62797c7a8432d
Author: Benjamin Otte <otte redhat com>
Date:   Sat Nov 4 01:35:59 2017 +0100

    x11: Don't use g_hash_table_steal()
    
    It returns TRUE/FALSE, not the item you've stolen, so if you free that,
    your X connections is gonna have a BadCursor.

 gdk/x11/gdkcursor-x11.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/gdk/x11/gdkcursor-x11.c b/gdk/x11/gdkcursor-x11.c
index ec9db4a..d7069f4 100644
--- a/gdk/x11/gdkcursor-x11.c
+++ b/gdk/x11/gdkcursor-x11.c
@@ -49,8 +49,9 @@ gdk_x11_cursor_remove_from_cache (gpointer data, GObject *cursor)
   GdkDisplay *display = data;
   Cursor xcursor;
 
-  xcursor = GDK_POINTER_TO_XID (g_hash_table_steal (GDK_X11_DISPLAY (display)->cursors, cursor));
+  xcursor = GDK_POINTER_TO_XID (g_hash_table_lookup (GDK_X11_DISPLAY (display)->cursors, cursor));
   XFreeCursor (GDK_DISPLAY_XDISPLAY (display), xcursor);
+  g_hash_table_remove (GDK_X11_DISPLAY (display)->cursors, cursor);
 }
 
 void


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]