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:
parent
021fc5cb2c
commit
f34b9a20b0
|
@ -1140,6 +1140,9 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
|
|||
dtype->preserve = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
dst->map->size_types = src->map->num_types;
|
||||
dst->map->num_types = src->map->num_types;
|
||||
}
|
||||
else {
|
||||
if (dst->map->types) {
|
||||
|
@ -1155,9 +1158,9 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
|
|||
xfree(dst->map->types);
|
||||
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->max_key_code != dst->max_key_code) {
|
||||
|
|
Loading…
Reference in New Issue
Block a user