hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-26 01:59:57 +00:00
Code Issues Projects Releases Wiki Activity

Xephyr: fix segfault in hostx_set_win_title during startup

Browse source 
screen->pScreen is NULL during hostx_init() because it's set later
during screen initialization. Use screen->mynum (the KdScreenInfo's
screen number) which is available from the start.

Also fix hostx_paint_rect for consistency.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2026-09-25 20:05:25 +02:00 • committed by Enrico Weigelt
commit e85f7a9c22
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hw/kdrive/ephyr/hostx.c
View file

@ -196,7 +196,7 @@ hostx_set_win_title(KdScreenInfo *screen, const char *extra_text)
memset(buf, 0, BUF_LEN + 1);
snprintf(buf, BUF_LEN, "Xephyr on %s.%d %s",
HostX.server_dpy_name ? HostX.server_dpy_name : ":0",
screen->pScreen->myNum, (extra_text != NULL) ? extra_text : "");
screen->mynum, (extra_text != NULL) ? extra_text : "");
xcb_icccm_set_wm_name(HostX.conn,
scrpriv->win,
@ -1038,7 +1038,7 @@ hostx_paint_rect(KdScreenInfo *screen,
{
EphyrScrPriv *scrpriv = screen->driver;
EPHYR_DBG("painting in screen %d\n", screen->pScreen->myNum);
EPHYR_DBG("painting in screen %d\n", screen->mynum);
#ifdef GLAMOR
if (ephyr_glamor) {