From 080f1b178856c25038b9bf87eb0b56292b29c54b Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Wed, 8 Jul 2026 12:04:16 -0400 Subject: [PATCH] MT#55283 fix compiler warning Change-Id: I10c334b83427ad5658ee8389daf484a9aa01d583 (cherry picked from commit 36bba3f5cbd2d85ab3af8a074b71d786acf19618) --- t/tests-preload.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/t/tests-preload.c b/t/tests-preload.c index 9fda04db6..c79928e3f 100644 --- a/t/tests-preload.c +++ b/t/tests-preload.c @@ -573,10 +573,11 @@ int accept4(int fd, struct sockaddr *addr, socklen_t *addrlen, int flags) { const char *err; int (*real_accept4)(int, struct sockaddr *, socklen_t *, int) = dlsym(RTLD_NEXT, "accept4"); + socket_t *s = NULL; err = "fd out of bounds"; if (fd < 0 || fd >= MAX_SOCKETS) goto do_accept_warn; - socket_t *s = &real_sockets[fd]; + s = &real_sockets[fd]; err = "fd not open"; if (!s->open) goto do_accept_warn; @@ -600,7 +601,8 @@ do_accept:; assert(sun.sun_family == AF_UNIX); socket_t *new_s = &real_sockets[new_fd]; - *new_s = *s; + if (s) + *new_s = *s; assert(sun_len < sizeof(new_s->sockname)); assert(sizeof(new_s->unix_path) >= strlen(sun.sun_path)); strcpy(new_s->unix_path, sun.sun_path); @@ -615,7 +617,7 @@ do_accept:; memset(addr, 0, *addrlen); memcpy(addr, &sst, socklen); *addrlen = socklen; - assert(s->wanted_domain == addr->sa_family); + assert(!s || s->wanted_domain == addr->sa_family); new_s->peername = sst; return new_fd;