From 964040764387d89ef64324cfbee31872ee6ce41c Mon Sep 17 00:00:00 2001 From: Tiago Vignatti Date: Wed, 4 Nov 2009 15:35:37 +0200 Subject: EXA: Preserve pPixmap->devPrivate.ptr in exaPixmapIsOffscreen_driver It crash the server when the drawable is 32 bit and the framebuffer is 16. This is pretty much a copy-past from commit 8e873185. Signed-off-by: Tiago Vignatti Signed-off-by: Keith Packard --- exa/exa_driver.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'exa') diff --git a/exa/exa_driver.c b/exa/exa_driver.c index 97036955b..a9165a158 100644 --- a/exa/exa_driver.c +++ b/exa/exa_driver.c @@ -204,11 +204,13 @@ exaPixmapIsOffscreen_driver(PixmapPtr pPixmap) { ScreenPtr pScreen = pPixmap->drawable.pScreen; ExaScreenPriv(pScreen); + pointer saved_ptr; Bool ret; + saved_ptr = pPixmap->devPrivate.ptr; pPixmap->devPrivate.ptr = ExaGetPixmapAddress(pPixmap); ret = pExaScr->info->PixmapIsOffscreen(pPixmap); - pPixmap->devPrivate.ptr = NULL; + pPixmap->devPrivate.ptr = saved_ptr; return ret; } -- cgit v1.2.3