brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland: Don't free non-transferred string when cleaning up

Browse Source 
When cleaning up the display name string management, the display name
string retrieved from libwayland-server was also passed to free() on
clean up. This is invalid as the display name string ownership is not
transferred to us. Fix this by strdup:ing the string before saving it.

https://bugzilla.gnome.org/show_bug.cgi?id=730551
This commit is contained in:
Jonas Ådahl 2017-09-04 12:32:53 +08:00
parent 8499a29d0a
commit 807658e972
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/wayland/meta-wayland.c
View File

@ -376,10 +376,13 @@ meta_wayland_init (void)
} }
else else
{ {
compositor->display_name = const char *display_name;
wl_display_add_socket_auto (compositor->wayland_display);
if (compositor->display_name == NULL) display_name = wl_display_add_socket_auto (compositor->wayland_display);
if (!display_name)
g_error ("Failed to create socket"); g_error ("Failed to create socket");
compositor->display_name = g_strdup (display_name);
} }
set_gnome_env ("DISPLAY", meta_wayland_get_xwayland_display_name (compositor)); set_gnome_env ("DISPLAY", meta_wayland_get_xwayland_display_name (compositor));