diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-12 15:21:19 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-12 15:21:19 +0000 |
| commit | e0058f158bae56c5a10cad4f9ace808a27022a9d (patch) | |
| tree | 0daf3e4bafd8a1c53f8228c41ffd1637c158bb29 /libX11/src/xkb | |
| parent | b639ce1e238ac06882d504aca591ab62475459c1 (diff) | |
| parent | 77ec02adbc8f9657e7749b307d3cc86ccbd163ea (diff) | |
| download | vcxsrv-e0058f158bae56c5a10cad4f9ace808a27022a9d.tar.gz vcxsrv-e0058f158bae56c5a10cad4f9ace808a27022a9d.tar.bz2 vcxsrv-e0058f158bae56c5a10cad4f9ace808a27022a9d.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'libX11/src/xkb')
| -rw-r--r-- | libX11/src/xkb/XKBGAlloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libX11/src/xkb/XKBGAlloc.c b/libX11/src/xkb/XKBGAlloc.c index 4cd40016b..832d28530 100644 --- a/libX11/src/xkb/XKBGAlloc.c +++ b/libX11/src/xkb/XKBGAlloc.c @@ -696,11 +696,11 @@ register XkbPropertyPtr prop; }
prop= &geom->properties[geom->num_properties];
prop->name= (char *)_XkbAlloc(strlen(name)+1);
- if (!name)
+ if (!prop->name)
return NULL;
strcpy(prop->name,name);
prop->value= (char *)_XkbAlloc(strlen(value)+1);
- if (!value) {
+ if (!prop->value) {
_XkbFree(prop->name);
prop->name= NULL;
return NULL;
|