Commit d9a6517d authored by Timm Bäder's avatar Timm Bäder 👎

wayland: Make sure window titles fit into a wl_buffer

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
parent 023f406c
......@@ -61,6 +61,8 @@ static guint signals[LAST_SIGNAL];
GDK_WINDOW_TYPE (window) != GDK_WINDOW_FOREIGN && \
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 _GdkWaylandWindowClass GdkWaylandWindowClass;
......@@ -2267,6 +2269,7 @@ gdk_wayland_window_set_title (GdkWindow *window,
const gchar *title)
{
GdkWindowImplWayland *impl;
const char *end;
g_return_if_fail (title != NULL);
if (GDK_WINDOW_DESTROYED (window))
......@@ -2275,7 +2278,11 @@ gdk_wayland_window_set_title (GdkWindow *window,
impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
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);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment