AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

wayland: Make sure window titles fit into a wl_buffer

Browse Source 
A wl_buffer has a max size of 4096 bytes, of which 8 are needed for the
header and another 4 for the string argument length (in this case), so
make sure the we only save the first 4083 bytes that are still valid
UTF8.

https://bugzilla.gnome.org/show_bug.cgi?id=767241
This commit is contained in:
Timm Bäder 2016-06-08 07:31:45 +02:00
parent 023f406c96
commit d9a6517d5f
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gdk/wayland/gdkwindow-wayland.c
View File

@ -61,6 +61,8 @@ static guint signals[LAST_SIGNAL];
GDK_WINDOW_TYPE (window) != GDK_WINDOW_FOREIGN && \ GDK_WINDOW_TYPE (window) != GDK_WINDOW_FOREIGN && \
GDK_WINDOW_TYPE (window) != GDK_WINDOW_OFFSCREEN) GDK_WINDOW_TYPE (window) != GDK_WINDOW_OFFSCREEN)
#define MAX_WL_BUFFER_SIZE (4083) /* 4096 minus header, string argument length and NUL byte */
typedef struct _GdkWaylandWindow GdkWaylandWindow; typedef struct _GdkWaylandWindow GdkWaylandWindow;
typedef struct _GdkWaylandWindowClass GdkWaylandWindowClass; typedef struct _GdkWaylandWindowClass GdkWaylandWindowClass;
@ -2267,6 +2269,7 @@ gdk_wayland_window_set_title (GdkWindow *window,
const gchar *title) const gchar *title)
{ {
GdkWindowImplWayland *impl; GdkWindowImplWayland *impl;
const char *end;
g_return_if_fail (title != NULL); g_return_if_fail (title != NULL);
if (GDK_WINDOW_DESTROYED (window)) if (GDK_WINDOW_DESTROYED (window))
@ -2275,7 +2278,11 @@ gdk_wayland_window_set_title (GdkWindow *window,
impl = GDK_WINDOW_IMPL_WAYLAND (window->impl); impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
g_free (impl->title); g_free (impl->title);
impl->title = g_strdup (title);
g_utf8_validate (title, MAX_WL_BUFFER_SIZE, &end);
impl->title = g_malloc (end - title + 1);
memcpy (impl->title, title, end - title);
impl->title[end - title] = '\0';
gdk_wayland_window_sync_title (window); gdk_wayland_window_sync_title (window);
} }