aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xquartz/xpr/xprCursor.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-12-08 11:23:34 +0000
committermarha <marha@users.sourceforge.net>2009-12-08 11:23:34 +0000
commit75d2bbcf0f39b9c85bc270728343f61dabebce2d (patch)
treecc3c92e0383bc1ed885d25290167c46b1f9edb15 /xorg-server/hw/xquartz/xpr/xprCursor.c
parent3e1ba549192a68801232c28a9c12defb59531654 (diff)
downloadvcxsrv-75d2bbcf0f39b9c85bc270728343f61dabebce2d.tar.gz
vcxsrv-75d2bbcf0f39b9c85bc270728343f61dabebce2d.tar.bz2
vcxsrv-75d2bbcf0f39b9c85bc270728343f61dabebce2d.zip
Git update 8/12/2009
Diffstat (limited to 'xorg-server/hw/xquartz/xpr/xprCursor.c')
-rw-r--r--xorg-server/hw/xquartz/xpr/xprCursor.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/xorg-server/hw/xquartz/xpr/xprCursor.c b/xorg-server/hw/xquartz/xpr/xprCursor.c
index b577fc099..fbaf825de 100644
--- a/xorg-server/hw/xquartz/xpr/xprCursor.c
+++ b/xorg-server/hw/xquartz/xpr/xprCursor.c
@@ -95,7 +95,10 @@ load_cursor(CursorPtr src, int screen)
const uint32_t *be_data=(uint32_t *) src->bits->argb;
unsigned i;
rowbytes = src->bits->width * sizeof (CARD32);
- data=alloca (rowbytes * src->bits->height);
+ data = xalloc(rowbytes * src->bits->height);
+ if(!data) {
+ FatalError("Failed to allocate memory in %s\n", __func__);
+ }
for(i=0;i<(src->bits->width*src->bits->height);i++)
data[i]=ntohl(be_data[i]);
#endif
@@ -118,8 +121,11 @@ load_cursor(CursorPtr src, int screen)
/* round up to 8 pixel boundary so we can convert whole bytes */
rowbytes = ((src->bits->width * 4) + 31) & ~31;
- data = alloca(rowbytes * src->bits->height);
-
+ data = xalloc(rowbytes * src->bits->height);
+ if(!data) {
+ FatalError("Failed to allocate memory in %s\n", __func__);
+ }
+
if (!src->bits->emptyMask)
{
ycount = src->bits->height;
@@ -168,6 +174,7 @@ load_cursor(CursorPtr src, int screen)
}
err = xp_set_cursor(width, height, hot_x, hot_y, data, rowbytes);
+ xfree(data);
return err == Success;
}