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

Xext: shm: move per-screen private structure into privates area

Browse Source 
Instead of having a pointer to a struct just consisting of a pointer,
just move that struct directly into the privates area, so we not just
save one extra indirection, but also not having to care about an extra
chunk of malloc'ed memory anymore (thus getting rid of a potential
OOM bug)

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-10-13 13:37:22 +02:00
committed by Enrico Weigelt
parent 2d71f0579f
commit 8d19217b56
1 changed files with 11 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Xext/shm.c
View File

@@ -200,33 +200,23 @@ CheckForShmSyscall(void)
static void
ShmScreenClose(CallbackListPtr *pcbl, ScreenPtr pScreen, void *unused)
{
ShmScrPrivateRec *screen_priv = ShmGetScreenPriv(pScreen);
dixSetPrivate(&pScreen->devPrivates, shmScrPrivateKey, NULL);
free(screen_priv);
dixScreenUnhookClose(pScreen, ShmScreenClose);
}
static ShmScrPrivateRec *
ShmInitScreenPriv(ScreenPtr pScreen)
{
ShmScrPrivateRec *screen_priv = ShmGetScreenPriv(pScreen);
if (!screen_priv) {
screen_priv = calloc(1, sizeof(ShmScrPrivateRec));
dixSetPrivate(&pScreen->devPrivates, shmScrPrivateKey, screen_priv);
dixScreenHookClose(pScreen, ShmScreenClose);
}
return screen_priv;
}
static Bool privatesRegistered = FALSE;
static Bool
ShmRegisterPrivates(void)
{
if (!dixRegisterPrivateKey(&shmScrPrivateKeyRec, PRIVATE_SCREEN, 0))
if (privatesRegistered)
return TRUE;
if (!dixRegisterPrivateKey(&shmScrPrivateKeyRec, PRIVATE_SCREEN, sizeof(ShmScrPrivateRec)))
return FALSE;
if (!dixRegisterPrivateKey(&shmPixmapPrivateKeyRec, PRIVATE_PIXMAP, 0))
return FALSE;
privatesRegistered = TRUE;
return TRUE;
}
@@ -241,12 +231,13 @@ ShmResetProc(ExtensionEntry * extEntry)
void
ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs)
{
/* we could be called before the extension initialized,
so make sure the privates are already registered. */
if (!ShmRegisterPrivates())
return;
ShmInitScreenPriv(pScreen)->shmFuncs = funcs;
ShmGetScreenPriv(pScreen)->shmFuncs = funcs;
}
void
ShmRegisterFbFuncs(ScreenPtr pScreen)
{
@@ -1395,10 +1386,7 @@ ShmExtensionInit(void)
{
sharedPixmaps = xTrue;
DIX_FOR_EACH_SCREEN({
ShmScrPrivateRec *screen_priv =
ShmInitScreenPriv(walkScreen);
if (!screen_priv)
continue;
ShmScrPrivateRec *screen_priv = ShmGetScreenPriv(walkScreen);
if (!screen_priv->shmFuncs)
screen_priv->shmFuncs = &miFuncs;
if (!screen_priv->shmFuncs->CreatePixmap)