XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 08:04:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Xext: namespace: fix NULL derefence on client close

Browse Source 
Removing the namespace assignment of killed clients in ClientState-hook
is too early - we still need it later. Using the new ClientDestroyCallback
instead.

Closes: https://github.com/X11Libre/xserver/issues/486
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-09-18 19:57:33 +02:00
committed by Enrico Weigelt
parent 2c3d96e3ca
commit f333cac5c2
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Xext/namespace/hook-clientstate.c
View File

@@ -33,13 +33,23 @@ void hookClientState(CallbackListPtr *pcbl, void *unused, void *calldata)
break;
case ClientStateRetained:
XnamespaceAssignClient(subj, NULL);
break;
case ClientStateGone:
XnamespaceAssignClient(subj, NULL);
break;
default:
XNS_HOOK_LOG("unknown state =%d\n", client->clientState);
break;
}
}
void hookClientDestroy(CallbackListPtr *pcbl, void *unused, void *calldata)
{
ClientPtr client = calldata;
struct XnamespaceClientPriv *subj = XnsClientPriv(client);
if (!subj)
return; /* no XNS devprivate assigned ? */
XnamespaceAssignClient(subj, NULL);
/* the devprivate is embedded, so no free() necessary */
}

1
Xext/namespace/hooks.h
View File

@@ -26,6 +26,7 @@
void hookClient(CallbackListPtr *pcbl, void *unused, void *calldata);
void hookClientState(CallbackListPtr *pcbl, void *unused, void *calldata);
void hookClientDestroy(CallbackListPtr *pcbl, void *unused, void *calldata);
void hookDevice(CallbackListPtr *pcbl, void *unused, void *calldata);
void hookExtAccess(CallbackListPtr *pcbl, void *unused, void *calldata);
void hookExtDispatch(CallbackListPtr *pcbl, void *unused, void *calldata);

2
Xext/namespace/namespace.c
View File

@@ -3,6 +3,7 @@
#include <stdio.h>
#include <X11/Xmd.h>
#include "dix/client_priv.h"
#include "dix/dix_priv.h"
#include "dix/extension_priv.h"
#include "dix/property_priv.h"
@@ -39,6 +40,7 @@ NamespaceExtensionInit(void)
AddCallback(&ExtensionAccessCallback, hookExtAccess, NULL) &&
AddCallback(&ExtensionDispatchCallback, hookExtDispatch, NULL) &&
AddCallback(&ServerAccessCallback, hookServerAccess, NULL) &&
AddCallback(&ClientDestroyCallback, hookClientDestroy, NULL) &&
XaceRegisterCallback(XACE_CLIENT_ACCESS, hookClient, NULL) &&
XaceRegisterCallback(XACE_DEVICE_ACCESS, hookDevice, NULL) &&
XaceRegisterCallback(XACE_PROPERTY_ACCESS, hookPropertyAccess, NULL) &&