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

glamor-ddx: Don't double free the cursor memory. 

Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
This commit is contained in:
Zhigang Gong 2011-09-26 16:13:57 +08:00
parent fe4c95ce84
commit 6a7ad1c929
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/xfree86/glamor/glamor_crtc.c
View File

@ -516,8 +516,7 @@ drmmode_hide_cursor (xf86CrtcPtr crtc)
static void static void
_drmmode_destroy_cursor(xf86CrtcPtr crtc) _drmmode_destroy_cursor(xf86CrtcPtr crtc)
{ {
drmmode_crtc_private_ptr drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
drmmode_crtc = crtc->driver_private;
if (drmmode_crtc->cursor == NULL) if (drmmode_crtc->cursor == NULL)
return; return;
@ -654,11 +653,8 @@ drmmode_crtc_gamma_set(xf86CrtcPtr crtc,
static void static void
drmmode_crtc_destroy(xf86CrtcPtr crtc) drmmode_crtc_destroy(xf86CrtcPtr crtc)
{ {
drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
ScrnInfoPtr scrn = crtc->scrn; ScrnInfoPtr scrn = crtc->scrn;
_drmmode_destroy_cursor(crtc); _drmmode_destroy_cursor(crtc);
free(drmmode_crtc->cursor);
crtc->driver_private = NULL; crtc->driver_private = NULL;
} }