mirror of
https://gitlab.freedesktop.org/xorg/xserver.git
synced 2025-12-26 03:00:07 +01:00
Merge branch 'bugfix/dixfonts-avoid-oom-null-ptr-deref' into 'master'
dix: avoid null ptr deref at doListFontsAndAliases See merge request xorg/xserver!2114
This commit is contained in:
commit
50da339cae
1 changed files with 2 additions and 3 deletions
|
|
@ -644,9 +644,8 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c)
|
|||
}
|
||||
if (err == FontNameAlias) {
|
||||
free(resolved);
|
||||
resolved = malloc(resolvedlen + 1);
|
||||
if (resolved)
|
||||
memcpy(resolved, tmpname, resolvedlen + 1);
|
||||
resolved = XNFalloc(resolvedlen + 1);
|
||||
memcpy(resolved, tmpname, resolvedlen + 1);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue