summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Bornecrantz <jakob@vmware.com>2012-05-29 23:01:14 +0200
committerJakob Bornecrantz <jakob@vmware.com>2012-08-30 16:35:04 +0200
commit007bed30270ca9548dfe6e359972b56cbb8e2f13 (patch)
tree3928400a302edefb6cbe945a78234616e7a6bd69
parente5ac80d8f72963313358e31cfb1ab98583e26f23 (diff)
vmwgfx: Guard against null rotate pixmap in shadow destroy
Reviewed-by: Thomas Hellström <thellstrom@vmware.com> Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
-rw-r--r--vmwgfx/vmwgfx_crtc.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/vmwgfx/vmwgfx_crtc.c b/vmwgfx/vmwgfx_crtc.c
index eaf87b2..fec04c0 100644
--- a/vmwgfx/vmwgfx_crtc.c
+++ b/vmwgfx/vmwgfx_crtc.c
@@ -250,8 +250,12 @@ crtc_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height)
static void
crtc_shadow_destroy(xf86CrtcPtr crtc, PixmapPtr rotate_pixmap, void *data)
{
- ScreenPtr pScreen = rotate_pixmap->drawable.pScreen;
+ ScreenPtr pScreen;
+ if (rotate_pixmap == NULL)
+ return;
+
+ pScreen = rotate_pixmap->drawable.pScreen;
pScreen->DestroyPixmap(rotate_pixmap);
}