RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

wayland, x11: fix possibly unsafe bstr usage 

In practice this never led to any issues due to implementation
details of bstr_sanitize_utf8_latin1, but there's no guarantee that
a bstr is correctly null-terminated.
This commit is contained in:
sfan5 2022-11-09 15:03:18 +01:00
parent 2e5d0d6e07
commit 175e250038
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
video/out/wayland_common.c
View File

@ -1684,7 +1684,7 @@ static int update_window_title(struct vo_wayland_state *wl, const char *title)
/* The xdg-shell protocol requires that the title is UTF-8. */
void *tmp = talloc_new(NULL);
struct bstr b_title = bstr_sanitize_utf8_latin1(tmp, bstr0(title));
xdg_toplevel_set_title(wl->xdg_toplevel, b_title.start);
xdg_toplevel_set_title(wl->xdg_toplevel, bstrto0(tmp, b_title));
talloc_free(tmp);
return VO_TRUE;
}

4
video/out/x11_common.c
View File

@ -1439,8 +1439,8 @@ static void vo_x11_update_window_title(struct vo *vo)
/* _NET_WM_NAME and _NET_WM_ICON_NAME must be sanitized to UTF-8. */
void *tmp = talloc_new(NULL);
struct bstr b_title = bstr_sanitize_utf8_latin1(tmp, bstr0(x11->window_title));
vo_x11_set_property_utf8(vo, XA(x11, _NET_WM_NAME), b_title.start);
vo_x11_set_property_utf8(vo, XA(x11, _NET_WM_ICON_NAME), b_title.start);
vo_x11_set_property_utf8(vo, XA(x11, _NET_WM_NAME), bstrto0(tmp, b_title));
vo_x11_set_property_utf8(vo, XA(x11, _NET_WM_ICON_NAME), bstrto0(tmp, b_title));
talloc_free(tmp);
}