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:
Mikhail 2025-12-19 03:36:55 +00:00
commit 50da339cae

View file

@ -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);
}
}