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

XQuartz: Avoid a crash when mistakenly free()ing in QuartzSetCursor on some configs

Browse Source 
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
This commit is contained in:
Jeremy Huddleston 2010-07-13 08:25:27 -07:00
parent 3209b094a3
commit 648d189548
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/xquartz/xpr/xprCursor.c
View File

@ -67,6 +67,7 @@ static Bool
load_cursor(CursorPtr src, int screen) load_cursor(CursorPtr src, int screen)
{ {
uint32_t *data; uint32_t *data;
Bool free_data = FALSE;
uint32_t rowbytes; uint32_t rowbytes;
int width, height; int width, height;
int hot_x, hot_y; int hot_x, hot_y;
@ -95,6 +96,7 @@ load_cursor(CursorPtr src, int screen)
unsigned i; unsigned i;
rowbytes = src->bits->width * sizeof (CARD32); rowbytes = src->bits->width * sizeof (CARD32);
data = malloc(rowbytes * src->bits->height); data = malloc(rowbytes * src->bits->height);
free_data = TRUE;
if(!data) { if(!data) {
FatalError("Failed to allocate memory in %s\n", __func__); FatalError("Failed to allocate memory in %s\n", __func__);
} }
@ -121,6 +123,7 @@ load_cursor(CursorPtr src, int screen)
/* round up to 8 pixel boundary so we can convert whole bytes */ /* round up to 8 pixel boundary so we can convert whole bytes */
rowbytes = ((src->bits->width * 4) + 31) & ~31; rowbytes = ((src->bits->width * 4) + 31) & ~31;
data = malloc(rowbytes * src->bits->height); data = malloc(rowbytes * src->bits->height);
free_data = TRUE;
if(!data) { if(!data) {
FatalError("Failed to allocate memory in %s\n", __func__); FatalError("Failed to allocate memory in %s\n", __func__);
} }
@ -173,7 +176,8 @@ load_cursor(CursorPtr src, int screen)
} }
err = xp_set_cursor(width, height, hot_x, hot_y, data, rowbytes); err = xp_set_cursor(width, height, hot_x, hot_y, data, rowbytes);
free(data); if(free_data)
free(data);
return err == Success; return err == Success;
} }