frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dix: SetKeySymMap should alloc the map if dst doesn't have one already.

This commit is contained in:
Peter Hutterer 2007-11-15 16:23:48 +10:30
parent b40646dc10
commit 53539688ca
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dix/devices.c
View File

@ -1046,10 +1046,9 @@ SetKeySymsMap(KeySymsPtr dst, KeySymsPtr src)
KeySym *map; KeySym *map;
int bytes = sizeof(KeySym) * src->mapWidth * int bytes = sizeof(KeySym) * src->mapWidth *
(dst->maxKeyCode - dst->minKeyCode + 1); (dst->maxKeyCode - dst->minKeyCode + 1);
map = (KeySym *)xalloc(bytes); map = (KeySym *)xcalloc(1, bytes);
if (!map) if (!map)
return FALSE; return FALSE;
bzero((char *)map, bytes);
if (dst->map) if (dst->map)
{ {
for (i = 0; i <= dst->maxKeyCode-dst->minKeyCode; i++) for (i = 0; i <= dst->maxKeyCode-dst->minKeyCode; i++)
@ -1060,6 +1059,15 @@ SetKeySymsMap(KeySymsPtr dst, KeySymsPtr src)
} }
dst->mapWidth = src->mapWidth; dst->mapWidth = src->mapWidth;
dst->map = map; dst->map = map;
} else if (!dst->map)
{
KeySym *map;
int bytes = sizeof(KeySym) * src->mapWidth *
(dst->maxKeyCode - dst->minKeyCode + 1);
map = (KeySym *)xcalloc(1, bytes);
if (!map)
return FALSE;
dst->map = map;
} }
memmove((char *)&dst->map[rowDif * dst->mapWidth], memmove((char *)&dst->map[rowDif * dst->mapWidth],
(char *)src->map, (char *)src->map,