XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 08:04:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

os: ResetHosts(): fix warning on potentially unitialized memory

Browse Source 
> In function ‘ConvertAddr’,
>    inlined from ‘ResetHosts’ at ../os/access.c:1014:26:
> ../os/access.c:1540:25: warning: ‘saddr’ may be used uninitialized [-Wmaybe-uninitialized]
>  1540 |         if (16777343 == *(long *) &((struct sockaddr_in *) saddr)->sin_addr)
>       |                         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> ../os/access.c: In function ‘ResetHosts’:
> ../os/access.c:908:7: note: ‘saddr’ declared here
>   908 |     } saddr;
>       |       ^~~~~

The union isn't needed at all, we're just using one of the fields anyways.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-12-04 14:45:55 +01:00
committed by Enrico Weigelt
parent beb15972d3
commit 71b25119f7
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
os/access.c
View File

@@ -900,13 +900,6 @@ ResetHosts(const char *display)
FILE *fd;
char *ptr;
int i, hostlen;
#if defined(TCPCONN) && (!defined(IPv6))
union {
struct sockaddr sa;
struct sockaddr_in in;
} saddr;
#endif
int family = 0;
void *addr = NULL;
int len;
@@ -1008,11 +1001,12 @@ ResetHosts(const char *display)
if ((family == FamilyInternet &&
((hp = _XGethostbyname(hostname, hparams)) != 0)) ||
((hp = _XGethostbyname(hostname, hparams)) != 0)) {
saddr.sa.sa_family = hp->h_addrtype;
len = sizeof(saddr.sa);
struct sockaddr sa = {
.sa_family = hp->h_addrtype
};
len = sizeof(sa);
if ((family =
ConvertAddr(&saddr.sa, &len,
(void **) &addr)) != -1) {
ConvertAddr(&sa, &len, (void **) &addr)) != -1) {
#ifdef h_addr /* new 4.3bsd version of gethostent */
char **list;