[mutter] xprops: Free meta_prop_get_cardinal_list() return value with g_free()



commit 5eaf6552240dd7d7a48705c2fe665a772926bbbb
Author: Hans de Goede <hdegoede redhat com>
Date:   Mon Sep 9 18:36:48 2019 +0200

    xprops: Free meta_prop_get_cardinal_list() return value with g_free()
    
    meta_prop_get_cardinal_list directly passes through the results->prop
    pointer which is g_malloc memory, so we should free the buffer it
    returns with g_free.
    
    https://gitlab.gnome.org/GNOME/mutter/merge_requests/786

 src/x11/meta-x11-display.c | 4 ++--
 src/x11/window-x11.c       | 4 ++--
 src/x11/xprops.c           | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/src/x11/meta-x11-display.c b/src/x11/meta-x11-display.c
index 77283d323..3ae5b3d8d 100644
--- a/src/x11/meta-x11-display.c
+++ b/src/x11/meta-x11-display.c
@@ -1320,7 +1320,7 @@ meta_x11_display_new (MetaDisplay *display, GError **error)
                                        &list, &n_items))
         {
           num = list[0];
-          meta_XFree (list);
+          g_free (list);
         }
 
         if (num > meta_workspace_manager_get_n_workspaces (display->workspace_manager))
@@ -2186,7 +2186,7 @@ meta_x11_display_update_workspace_layout (MetaX11Display *x11_display)
                         "(3 is accepted for backwards compat)\n", n_items);
         }
 
-      meta_XFree (list);
+      g_free (list);
 
       meta_workspace_manager_update_workspace_layout (workspace_manager,
                                                       starting_corner,
diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c
index 15d37c5c9..7d10a1092 100644
--- a/src/x11/window-x11.c
+++ b/src/x11/window-x11.c
@@ -1637,7 +1637,7 @@ meta_window_x11_update_struts (MetaWindow *window)
                         struts[0], struts[1], struts[2], struts[3],
                         window->desc);
         }
-      meta_XFree (struts);
+      g_free (struts);
     }
   else
     {
@@ -1696,7 +1696,7 @@ meta_window_x11_update_struts (MetaWindow *window)
                         struts[0], struts[1], struts[2], struts[3],
                         window->desc);
         }
-      meta_XFree (struts);
+      g_free (struts);
     }
   else if (!new_struts)
     {
diff --git a/src/x11/xprops.c b/src/x11/xprops.c
index c0d0d271a..397019c70 100644
--- a/src/x11/xprops.c
+++ b/src/x11/xprops.c
@@ -1111,7 +1111,7 @@ free_value (MetaPropValue *value)
       g_strfreev (value->v.string_list.strings);
       break;
     case META_PROP_VALUE_CARDINAL_LIST:
-      free (value->v.cardinal_list.cardinals);
+      g_free (value->v.cardinal_list.cardinals);
       break;
     case META_PROP_VALUE_SYNC_COUNTER:
       break;


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