andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Less intrusive workaround for sporadic segfault on resume.

Browse Source 
Hopefully fixes fdo #24010 (memleak).
This commit is contained in:
Matthias Hopf 2009-09-21 15:44:00 +02:00
parent 55747d256d
commit 977953bf14
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/xfree86/modes/xf86Cursors.c
View File

@ -461,10 +461,6 @@ xf86_use_hw_cursor (ScreenPtr screen, CursorPtr cursor)
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
xf86CursorInfoPtr cursor_info = xf86_config->cursor_info; xf86CursorInfoPtr cursor_info = xf86_config->cursor_info;
if (xf86_config->cursor == cursor) {
xf86DrvMsg(index, X_ERROR, "Trying to set already set cursor.\n");
return FALSE;
}
if (xf86_config->cursor) if (xf86_config->cursor)
FreeCursor (xf86_config->cursor, None); FreeCursor (xf86_config->cursor, None);
xf86_config->cursor = cursor; xf86_config->cursor = cursor;
@ -484,12 +480,14 @@ xf86_use_hw_cursor_argb (ScreenPtr screen, CursorPtr cursor)
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
xf86CursorInfoPtr cursor_info = xf86_config->cursor_info; xf86CursorInfoPtr cursor_info = xf86_config->cursor_info;
if (xf86_config->cursor == cursor) { if (xf86_config->cursor) {
xf86DrvMsg(index, X_ERROR, "Trying to set already set cursor.\n"); /* Under some circumstances an already set cursor is set again.
return FALSE; * If the pointer is freed, ->bits is killed */
if (xf86_config->cursor != cursor)
FreeCursor (xf86_config->cursor, None);
else
--cursor->refcnt;
} }
if (xf86_config->cursor)
FreeCursor (xf86_config->cursor, None);
xf86_config->cursor = cursor; xf86_config->cursor = cursor;
++cursor->refcnt; ++cursor->refcnt;