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

exa: fix a potential loophole in "mixed" 

- Always free sys_ptr before setting the pixmap to pinned.
This commit is contained in:
Maarten Maathuis 2009-08-07 20:04:53 +02:00
parent e94c7c42ce
commit 1548e8ae5d
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
exa/exa_mixed.c
View File

@ -145,20 +145,22 @@ exaModifyPixmapHeader_mixed(PixmapPtr pPixmap, int width, int height, int depth,
pExaPixmap = ExaGetPixmapPriv(pPixmap); pExaPixmap = ExaGetPixmapPriv(pPixmap);
if (pExaPixmap) { if (pExaPixmap) {
if (pPixData) { if (!exaPixmapIsPinned(pPixmap)) {
if (!exaPixmapIsPinned(pPixmap)) { free(pExaPixmap->sys_ptr);
free(pExaPixmap->sys_ptr); pExaPixmap->sys_ptr = pPixmap->devPrivate.ptr = NULL;
pExaPixmap->sys_pitch = pPixmap->devKind = 0;
/* We no longer need this. */ /* We no longer need this. */
if (pExaPixmap->pDamage) { if (pExaPixmap->pDamage) {
DamageUnregister(&pPixmap->drawable, pExaPixmap->pDamage); DamageUnregister(&pPixmap->drawable, pExaPixmap->pDamage);
DamageDestroy(pExaPixmap->pDamage); DamageDestroy(pExaPixmap->pDamage);
pExaPixmap->pDamage = NULL; pExaPixmap->pDamage = NULL;
}
} }
pExaPixmap->sys_ptr = pPixData;
} }
if (pPixData)
pExaPixmap->sys_ptr = pPixData;
if (devKind > 0) if (devKind > 0)
pExaPixmap->sys_pitch = devKind; pExaPixmap->sys_pitch = devKind;