diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-12 14:57:48 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-12 14:57:48 +0000 |
| commit | 77ec02adbc8f9657e7749b307d3cc86ccbd163ea (patch) | |
| tree | 8b11e4e5002a05a69a7b7dfe5ce79162448f2aa2 /libX11/src | |
| parent | f81bb3160c5f39d8f7ad329e99865af88f02b96a (diff) | |
| download | vcxsrv-77ec02adbc8f9657e7749b307d3cc86ccbd163ea.tar.gz vcxsrv-77ec02adbc8f9657e7749b307d3cc86ccbd163ea.tar.bz2 vcxsrv-77ec02adbc8f9657e7749b307d3cc86ccbd163ea.zip | |
libX11 pixman mesa git update 12 Mar 2011
Diffstat (limited to 'libX11/src')
| -rw-r--r-- | libX11/src/KeyBind.c | 2 | ||||
| -rw-r--r-- | libX11/src/xkb/XKBGAlloc.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libX11/src/KeyBind.c b/libX11/src/KeyBind.c index cc1906fad..6eb84328c 100644 --- a/libX11/src/KeyBind.c +++ b/libX11/src/KeyBind.c @@ -996,7 +996,7 @@ XRebindKeysym ( tmp = dpy->key_bindings;
nb = sizeof(KeySym) * nm;
- if ((! (p = (struct _XKeytrans *) Xmalloc( sizeof(struct _XKeytrans)))) ||
+ if ((! (p = (struct _XKeytrans *) Xcalloc( 1, sizeof(struct _XKeytrans)))) ||
((! (p->string = (char *) Xmalloc( (unsigned) nbytes))) &&
(nbytes > 0)) ||
((! (p->modifiers = (KeySym *) Xmalloc( (unsigned) nb))) &&
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;
|