diff options
| author | marha <marha@users.sourceforge.net> | 2010-09-11 09:26:35 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-09-11 09:26:35 +0000 |
| commit | 35b29c19707341bbfa32f7f6136ce09e59cb332c (patch) | |
| tree | a795242657a2b96a463a11774517472fa4c64953 /xorg-server/xkb/xkmread.c | |
| parent | ba6498fea6d935aff0856f9851cb47d5657952fa (diff) | |
| parent | e172c89783326e2378e4793ff31a0f44210c5534 (diff) | |
| download | vcxsrv-35b29c19707341bbfa32f7f6136ce09e59cb332c.tar.gz vcxsrv-35b29c19707341bbfa32f7f6136ce09e59cb332c.tar.bz2 vcxsrv-35b29c19707341bbfa32f7f6136ce09e59cb332c.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/xkb/xkmread.c')
| -rw-r--r-- | xorg-server/xkb/xkmread.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/xorg-server/xkb/xkmread.c b/xorg-server/xkb/xkmread.c index 4b2043667..81f09fe3b 100644 --- a/xorg-server/xkb/xkmread.c +++ b/xorg-server/xkb/xkmread.c @@ -534,8 +534,7 @@ XkbAction *act; case XkbSA_XFree86Private:
/* copy the kind of action */
- strncpy((char*)act->any.data, (char*)wire.actionData,
- XkbAnyActionDataSize);
+ memcpy(act->any.data, wire.actionData, XkbAnyActionDataSize);
break ;
case XkbSA_Terminate:
@@ -687,7 +686,11 @@ int nRead=0; if ((tmp=XkmGetCountedString(file,buf,100))<1)
return -1;
nRead+= tmp;
- if ((buf[0]!='\0')&&(xkb->names)) {
+
+ if (!xkb->names)
+ continue;
+
+ if (buf[0]!='\0') {
Atom name;
name= XkbInternAtom(buf,0);
xkb->names->groups[i]= name;
|