frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix cursor ref counting mistakes with sprites and xf86Cursor.c 

A few cursor value assignments weren't getting correctly ref counted,
causing leaks of cursor objects.

Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Keith Packard 2010-04-30 12:18:09 -07:00
parent a80b1f888f
commit cdeb2c23f8
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dix/devices.c
View File

@ -851,6 +851,8 @@ CloseDevice(DeviceIntPtr dev)
} }
if (DevHasCursor(dev) && dev->spriteInfo->sprite) { if (DevHasCursor(dev) && dev->spriteInfo->sprite) {
if (dev->spriteInfo->sprite->current)
FreeCursor(dev->spriteInfo->sprite->current, None);
xfree(dev->spriteInfo->sprite->spriteTrace); xfree(dev->spriteInfo->sprite->spriteTrace);
xfree(dev->spriteInfo->sprite); xfree(dev->spriteInfo->sprite);
} }

20
dix/events.c
View File

@ -2932,6 +2932,7 @@ InitializeSprite(DeviceIntPtr pDev, WindowPtr pWin)
{ {
SpritePtr pSprite; SpritePtr pSprite;
ScreenPtr pScreen; ScreenPtr pScreen;
CursorPtr pCursor;
if (!pDev->spriteInfo->sprite) if (!pDev->spriteInfo->sprite)
{ {
@ -2975,8 +2976,7 @@ InitializeSprite(DeviceIntPtr pDev, WindowPtr pWin)
if (pWin) if (pWin)
{ {
pSprite->current = wCursor(pWin); pCursor = wCursor(pWin);
pSprite->current->refcnt++;
pSprite->spriteTrace = (WindowPtr *)xcalloc(1, 32*sizeof(WindowPtr)); pSprite->spriteTrace = (WindowPtr *)xcalloc(1, 32*sizeof(WindowPtr));
if (!pSprite->spriteTrace) if (!pSprite->spriteTrace)
FatalError("Failed to allocate spriteTrace"); FatalError("Failed to allocate spriteTrace");
@ -2989,13 +2989,18 @@ InitializeSprite(DeviceIntPtr pDev, WindowPtr pWin)
pSprite->pDequeueScreen = pSprite->pEnqueueScreen; pSprite->pDequeueScreen = pSprite->pEnqueueScreen;
} else { } else {
pSprite->current = NullCursor; pCursor = NullCursor;
pSprite->spriteTrace = NULL; pSprite->spriteTrace = NULL;
pSprite->spriteTraceSize = 0; pSprite->spriteTraceSize = 0;
pSprite->spriteTraceGood = 0; pSprite->spriteTraceGood = 0;
pSprite->pEnqueueScreen = screenInfo.screens[0]; pSprite->pEnqueueScreen = screenInfo.screens[0];
pSprite->pDequeueScreen = pSprite->pEnqueueScreen; pSprite->pDequeueScreen = pSprite->pEnqueueScreen;
} }
if (pCursor)
pCursor->refcnt++;
if (pSprite->current)
FreeCursor(pSprite->current, None);
pSprite->current = pCursor;
if (pScreen) if (pScreen)
{ {
@ -3048,6 +3053,7 @@ UpdateSpriteForScreen(DeviceIntPtr pDev, ScreenPtr pScreen)
{ {
SpritePtr pSprite = NULL; SpritePtr pSprite = NULL;
WindowPtr win = NULL; WindowPtr win = NULL;
CursorPtr pCursor;
if (!pScreen) if (!pScreen)
return ; return ;
@ -3063,8 +3069,12 @@ UpdateSpriteForScreen(DeviceIntPtr pDev, ScreenPtr pScreen)
pSprite->hotLimits.x2 = pScreen->width; pSprite->hotLimits.x2 = pScreen->width;
pSprite->hotLimits.y2 = pScreen->height; pSprite->hotLimits.y2 = pScreen->height;
pSprite->win = win; pSprite->win = win;
pSprite->current = wCursor (win); pCursor = wCursor(win);
pSprite->current->refcnt++; if (pCursor)
pCursor->refcnt++;
if (pSprite->current)
FreeCursor(pSprite->current, 0);
pSprite->current = pCursor;
pSprite->spriteTraceGood = 1; pSprite->spriteTraceGood = 1;
pSprite->spriteTrace[0] = win; pSprite->spriteTrace[0] = win;
(*pScreen->CursorLimits) (pDev, (*pScreen->CursorLimits) (pDev,

2
hw/xfree86/ramdac/xf86Cursor.c
View File

@ -312,6 +312,8 @@ xf86CursorSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCurs,
xf86SetCursor(pScreen, NullCursor, x, y); xf86SetCursor(pScreen, NullCursor, x, y);
ScreenPriv->isUp = FALSE; ScreenPriv->isUp = FALSE;
} }
if (ScreenPriv->CurrentCursor)
FreeCursor(ScreenPriv->CurrentCursor, None);
ScreenPriv->CurrentCursor = NullCursor; ScreenPriv->CurrentCursor = NullCursor;
return; return;
} }