From 957831d2babeebd556bd07fc3a1e82880a6c4d70 Mon Sep 17 00:00:00 2001 From: Jussi Kivilinna Date: Wed, 11 Oct 2017 11:04:05 -0600 Subject: [PATCH] net/socket: psock_send/psock_sendto: remove assert check for null psock and buf input pointers. Removes check as 'psock == NULL' altogether because that checked for later in psock_send and psock_sendto. Change null check for 'buf' so that it is handled same as in recvfrom.c (return -EINVAL instead of assert). --- net/socket/send.c | 9 ++++++++- net/socket/sendto.c | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/net/socket/send.c b/net/socket/send.c index 2794b93e92..ede7761963 100644 --- a/net/socket/send.c +++ b/net/socket/send.c @@ -89,7 +89,14 @@ ssize_t psock_send(FAR struct socket *psock, FAR const void *buf, size_t len, { ssize_t ret; - DEBUGASSERT(psock != NULL && buf != NULL); + /* Verify that non-NULL pointers were passed */ + +#ifdef CONFIG_DEBUG_FEATURES + if (buf == NULL) + { + return -EINVAL; + } +#endif /* Verify that the sockfd corresponds to valid, allocated socket */ diff --git a/net/socket/sendto.c b/net/socket/sendto.c index 1cda70f3e4..298c64f0f6 100644 --- a/net/socket/sendto.c +++ b/net/socket/sendto.c @@ -124,7 +124,14 @@ ssize_t psock_sendto(FAR struct socket *psock, FAR const void *buf, { ssize_t nsent; - DEBUGASSERT(psock != NULL && buf != NULL); + /* Verify that non-NULL pointers were passed */ + +#ifdef CONFIG_DEBUG_FEATURES + if (buf == NULL) + { + return -EINVAL; + } +#endif /* If to is NULL or tolen is zero, then this function is same as send (for * connected socket types)