diff options
| author | marha <marha@users.sourceforge.net> | 2010-03-22 10:29:25 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-03-22 10:29:25 +0000 |
| commit | ac80633ce275edddaa3e4fa2ae0c048ed00f7d74 (patch) | |
| tree | 7d4ceffed59f2782533d3485c075f605ab1b9c61 /xorg-server/hw/xfree86/modes/xf86Cursors.c | |
| parent | 6fc6cb8c935fab174e4582909c1cb4f12bd598bf (diff) | |
| download | vcxsrv-ac80633ce275edddaa3e4fa2ae0c048ed00f7d74.tar.gz vcxsrv-ac80633ce275edddaa3e4fa2ae0c048ed00f7d74.tar.bz2 vcxsrv-ac80633ce275edddaa3e4fa2ae0c048ed00f7d74.zip | |
svn merge -c505 ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/modes/xf86Cursors.c')
| -rw-r--r-- | xorg-server/hw/xfree86/modes/xf86Cursors.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/hw/xfree86/modes/xf86Cursors.c b/xorg-server/hw/xfree86/modes/xf86Cursors.c index 385848b7a..e2e174e59 100644 --- a/xorg-server/hw/xfree86/modes/xf86Cursors.c +++ b/xorg-server/hw/xfree86/modes/xf86Cursors.c @@ -461,11 +461,11 @@ xf86_use_hw_cursor (ScreenPtr screen, CursorPtr cursor) xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); xf86CursorInfoPtr cursor_info = xf86_config->cursor_info; + ++cursor->refcnt; if (xf86_config->cursor) FreeCursor (xf86_config->cursor, None); xf86_config->cursor = cursor; - ++cursor->refcnt; - + if (cursor->bits->width > cursor_info->MaxWidth || cursor->bits->height> cursor_info->MaxHeight) return FALSE; |