Skip to content

Commit 80b6dce

Browse files
committed
[nrf fromlist] log: net: Fix build warning with IPv6 disabled
Building the net logger backend with IPv4 only gives the following warning: log_backend_net.c:116:31: warning: array subscript 'struct sockaddr[0]' is partly outside array bounds of 'struct sockaddr_in[1]' [-Warray-bounds] local_addr->sa_family = server_addr.sa_family; hence assign the address family directly to sockaddr_in/6 structs. Upstream PR: zephyrproject-rtos/zephyr#79375 Signed-off-by: Robert Lubos <[email protected]>
1 parent d44182b commit 80b6dce

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

subsys/logging/backends/log_backend_net.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,14 @@ static int do_net_init(struct log_backend_net_ctx *ctx)
9999
if (IS_ENABLED(CONFIG_NET_IPV4) && server_addr.sa_family == AF_INET) {
100100
local_addr = (struct sockaddr *)&local_addr4;
101101
server_addr_len = sizeof(struct sockaddr_in);
102+
local_addr4.sin_family = AF_INET;
102103
local_addr4.sin_port = 0U;
103104
}
104105

105106
if (IS_ENABLED(CONFIG_NET_IPV6) && server_addr.sa_family == AF_INET6) {
106107
local_addr = (struct sockaddr *)&local_addr6;
107108
server_addr_len = sizeof(struct sockaddr_in6);
109+
local_addr6.sin6_family = AF_INET6;
108110
local_addr6.sin6_port = 0U;
109111
}
110112

@@ -113,8 +115,6 @@ static int do_net_init(struct log_backend_net_ctx *ctx)
113115
return -EINVAL;
114116
}
115117

116-
local_addr->sa_family = server_addr.sa_family;
117-
118118
if (ctx->is_tcp) {
119119
proto = IPPROTO_TCP;
120120
type = SOCK_STREAM;

0 commit comments

Comments
 (0)