fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-04-17 23:10:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'os-1817' into 'main'

Browse source 
Fix issues from !1817 in os/*.c

See merge request xorg/xserver!2163
This commit is contained in:
Alan Coopersmith 2026-03-29 16:31:19 -07:00
commit e25b79404c
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
os/utils.c
View file

@ -1115,6 +1115,14 @@ set_font_authorizations(char **authorizations, int *authlen, void *client)
len = strlen(hnameptr) + 1;
result = malloc(len + sizeof(AUTHORIZATION_NAME) + 4);
if (result == NULL) {
#if defined(HAVE_GETADDRINFO)
if (ai) {
freeaddrinfo(ai);
}
#endif
return 0;
}
p = result;
*p++ = sizeof(AUTHORIZATION_NAME) >> 8;

2
os/xdmcp.c
View file

@ -1518,7 +1518,7 @@ get_mcast_options(int argc, char **argv, int i)
else {
struct multicastinfo *mcastinfo, *mcl;
mcastinfo = malloc(sizeof(struct multicastinfo));
mcastinfo = XNFalloc(sizeof(struct multicastinfo));
mcastinfo->next = NULL;
mcastinfo->ai = firstai;
mcastinfo->hops = hopcount;