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

XKB: Be a tiny bit more conservative with type allocation 

Make sure size_types will _always_ be 0 if we don't have any types.
This commit is contained in:
Daniel Stone 2007-03-21 02:03:37 +02:00 committed by Daniel Stone
parent 021fc5cb2c
commit f34b9a20b0
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
xkb/xkbUtils.c
View File

@ -1140,6 +1140,9 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
dtype->preserve = NULL; dtype->preserve = NULL;
} }
} }
dst->map->size_types = src->map->num_types;
dst->map->num_types = src->map->num_types;
} }
else { else {
if (dst->map->types) { if (dst->map->types) {
@ -1155,9 +1158,9 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
xfree(dst->map->types); xfree(dst->map->types);
dst->map->types = NULL; dst->map->types = NULL;
} }
dst->map->num_types = 0;
dst->map->size_types = 0;
} }
dst->map->size_types = src->map->num_types;
dst->map->num_types = src->map->num_types;
if (src->map->modmap) { if (src->map->modmap) {
if (src->max_key_code != dst->max_key_code) { if (src->max_key_code != dst->max_key_code) {