Skip to content

Commit 2d49ef2

Browse files
rlubosdanieldegrasse
authored andcommitted
tests: net: socket: udp: Don't call memset() on a NULL pointer
cmsgbuf pointer can be NULL, therefore verify that before calling memset() on it. Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
1 parent 62a5260 commit 2d49ef2

File tree

1 file changed

+9
-3
lines changed
  • tests/net/socket/udp/src

1 file changed

+9
-3
lines changed

tests/net/socket/udp/src/main.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1495,7 +1495,9 @@ static void comm_sendmsg_recvmsg(int client_sock,
14951495
io_vector[0].iov_len = sizeof(buf);
14961496

14971497
memset(msg, 0, sizeof(*msg));
1498-
memset(cmsgbuf, 0, cmsgbuf_len);
1498+
if (cmsgbuf != NULL) {
1499+
memset(cmsgbuf, 0, cmsgbuf_len);
1500+
}
14991501
msg->msg_control = cmsgbuf;
15001502
msg->msg_controllen = cmsgbuf_len;
15011503
msg->msg_iov = io_vector;
@@ -1572,7 +1574,9 @@ static void comm_sendmsg_recvmsg(int client_sock,
15721574
io_vector[1].iov_len = sizeof(buf);
15731575

15741576
memset(msg, 0, sizeof(*msg));
1575-
memset(cmsgbuf, 0, cmsgbuf_len);
1577+
if (cmsgbuf != NULL) {
1578+
memset(cmsgbuf, 0, cmsgbuf_len);
1579+
}
15761580
msg->msg_control = cmsgbuf;
15771581
msg->msg_controllen = cmsgbuf_len;
15781582
msg->msg_iov = io_vector;
@@ -1642,7 +1646,9 @@ static void comm_sendmsg_recvmsg(int client_sock,
16421646
io_vector[0].iov_len = sizeof(buf2);
16431647

16441648
memset(msg, 0, sizeof(*msg));
1645-
memset(cmsgbuf, 0, cmsgbuf_len);
1649+
if (cmsgbuf != NULL) {
1650+
memset(cmsgbuf, 0, cmsgbuf_len);
1651+
}
16461652
msg->msg_control = cmsgbuf;
16471653
msg->msg_controllen = cmsgbuf_len;
16481654
msg->msg_iov = io_vector;

0 commit comments

Comments
 (0)