diff options
| author | marha <marha@users.sourceforge.net> | 2011-04-14 08:39:30 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-04-14 08:39:30 +0000 |
| commit | 898081f31f99dc35a1602a607a07d1aaff49ac40 (patch) | |
| tree | b2adbc0fd699cc5dc2af141df26130e7874f9369 /xorg-server/dix/dispatch.c | |
| parent | c1e91b66cbcf91645f65b9d63f115dcb5a441406 (diff) | |
| parent | 019fc27ce6dc2a1809107be10d4deb80e0fa436b (diff) | |
| download | vcxsrv-898081f31f99dc35a1602a607a07d1aaff49ac40.tar.gz vcxsrv-898081f31f99dc35a1602a607a07d1aaff49ac40.tar.bz2 vcxsrv-898081f31f99dc35a1602a607a07d1aaff49ac40.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/dix/dispatch.c')
| -rw-r--r-- | xorg-server/dix/dispatch.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/xorg-server/dix/dispatch.c b/xorg-server/dix/dispatch.c index 5e1c858b6..14775c35c 100644 --- a/xorg-server/dix/dispatch.c +++ b/xorg-server/dix/dispatch.c @@ -3017,11 +3017,17 @@ ProcCreateCursor (ClientPtr client) &pCursor, client, stuff->cid);
if (rc != Success)
- return rc;
- if (!AddResource(stuff->cid, RT_CURSOR, (pointer)pCursor))
- return BadAlloc;
+ goto bail;
+ if (!AddResource(stuff->cid, RT_CURSOR, (pointer)pCursor)) {
+ rc = BadAlloc;
+ goto bail;
+ }
return Success;
+bail:
+ free(srcbits);
+ free(mskbits);
+ return rc;
}
int
|