diff options
author | Olivier CrĂȘte <olivier.crete@collabora.com> | 2016-06-02 19:22:50 -0400 |
---|---|---|
committer | Olivier CrĂȘte <olivier.crete@collabora.com> | 2016-06-02 19:23:49 -0400 |
commit | b58e852de6183f2bda4e7d322a35d18edf5cbbed (patch) | |
tree | 41f50888d1213ee389f8d30d874c36889e60b9a7 /socket | |
parent | baab2c3c7049f984cdca6ed622059c62ce8cebf7 (diff) | |
download | libnice-b58e852de6183f2bda4e7d322a35d18edf5cbbed.tar.gz |
socket: Assert trying to use free'd socket
Cleanly returnign makes no sense and may hide
worse problems.
Diffstat (limited to 'socket')
-rw-r--r-- | socket/http.c | 10 | ||||
-rw-r--r-- | socket/pseudossl.c | 10 | ||||
-rw-r--r-- | socket/socks5.c | 10 | ||||
-rw-r--r-- | socket/tcp-bsd.c | 15 | ||||
-rw-r--r-- | socket/udp-bsd.c | 15 | ||||
-rw-r--r-- | socket/udp-turn-over-tcp.c | 20 | ||||
-rw-r--r-- | socket/udp-turn.c | 15 |
7 files changed, 38 insertions, 57 deletions
diff --git a/socket/http.c b/socket/http.c index e706dbe..96ddfd8 100644 --- a/socket/http.c +++ b/socket/http.c @@ -283,9 +283,8 @@ socket_recv_messages (NiceSocket *sock, HttpPriv *priv = sock->priv; gint ret = -1; - /* Socket has been closed: */ - if (sock->priv == NULL) - return 0; + /* Make sure socket has not been freed: */ + g_assert (sock->priv != NULL); if (priv->state == HTTP_STATE_CONNECTED) { guint i; @@ -578,9 +577,8 @@ socket_send_messages (NiceSocket *sock, const NiceAddress *to, { HttpPriv *priv = sock->priv; - /* Socket has been closed: */ - if (sock->priv == NULL) - return -1; + /* Make sure socket has not been freed: */ + g_assert (sock->priv != NULL); if (priv->state == HTTP_STATE_CONNECTED) { /* Fast path. */ diff --git a/socket/pseudossl.c b/socket/pseudossl.c index 8ebd0c3..052725c 100644 --- a/socket/pseudossl.c +++ b/socket/pseudossl.c @@ -206,9 +206,8 @@ socket_recv_messages (NiceSocket *sock, { PseudoSSLPriv *priv = sock->priv; - /* Socket has been closed: */ - if (sock->priv == NULL) - return 0; + /* Make sure socket has not been freed: */ + g_assert (sock->priv != NULL); if (priv->handshaken) { if (priv->base_socket) { @@ -258,9 +257,8 @@ socket_send_messages (NiceSocket *sock, const NiceAddress *to, { PseudoSSLPriv *priv = sock->priv; - /* Socket has been closed: */ - if (sock->priv == NULL) - return -1; + /* Make sure socket has not been freed: */ + g_assert (sock->priv != NULL); if (priv->handshaken) { /* Fast path: pass directly through to the base socket once the handshake is diff --git a/socket/socks5.c b/socket/socks5.c index cdf295a..d15fc29 100644 --- a/socket/socks5.c +++ b/socket/socks5.c @@ -169,9 +169,8 @@ socket_recv_messages (NiceSocket *sock, guint i; gint ret = -1; - /* Socket has been closed: */ - if (sock->priv == NULL) - return 0; + /* Make sure socket has not been freed: */ + g_assert (sock->priv != NULL); switch (priv->state) { case SOCKS_STATE_CONNECTED: @@ -425,9 +424,8 @@ socket_send_messages (NiceSocket *sock, const NiceAddress *to, { Socks5Priv *priv = sock->priv; - /* Socket has been closed: */ - if (sock->priv == NULL) - return -1; + /* Make sure socket has not been freed: */ + g_assert (sock->priv != NULL); if (priv->state == SOCKS_STATE_CONNECTED) { /* Fast path: pass through to the base socket once connected. */ diff --git a/socket/tcp-bsd.c b/socket/tcp-bsd.c index c02d6e2..3e5f5a8 100644 --- a/socket/tcp-bsd.c +++ b/socket/tcp-bsd.c @@ -237,9 +237,8 @@ socket_recv_messages (NiceSocket *sock, TcpPriv *priv = sock->priv; guint i; - /* Socket has been closed: */ - if (sock->priv == NULL) - return 0; + /* Make sure socket has not been freed: */ + g_assert (sock->priv != NULL); /* Don't try to access the socket if it had an error */ if (priv->error) @@ -291,9 +290,8 @@ socket_send_message (NiceSocket *sock, GError *gerr = NULL; gsize message_len; - /* Socket has been closed: */ - if (sock->priv == NULL) - return -1; + /* Make sure socket has not been freed: */ + g_assert (sock->priv != NULL); /* Don't try to access the socket if it had an error, otherwise we risk a * crash with SIGPIPE (Broken pipe) */ @@ -352,9 +350,8 @@ socket_send_messages (NiceSocket *sock, const NiceAddress *to, { guint i; - /* Socket has been closed: */ - if (sock->priv == NULL) - return -1; + /* Make sure socket has not been freed: */ + g_assert (sock->priv != NULL); for (i = 0; i < n_messages; i++) { const NiceOutputMessage *message = &messages[i]; diff --git a/socket/udp-bsd.c b/socket/udp-bsd.c index d7346ff..3fac544 100644 --- a/socket/udp-bsd.c +++ b/socket/udp-bsd.c @@ -183,9 +183,8 @@ socket_recv_messages (NiceSocket *sock, guint i; gboolean error = FALSE; - /* Socket has been closed: */ - if (sock->priv == NULL) - return 0; + /* Make sure socket has not been freed: */ + g_assert (sock->priv != NULL); /* Read messages into recv_messages until one fails or would block, or we * reach the end. */ @@ -248,9 +247,8 @@ socket_send_message (NiceSocket *sock, const NiceAddress *to, GError *child_error = NULL; gssize len; - /* Socket has been closed: */ - if (priv == NULL) - return -1; + /* Make sure socket has not been freed: */ + g_assert (sock->priv != NULL); if (!nice_address_is_valid (&priv->niceaddr) || !nice_address_equal (&priv->niceaddr, to)) { @@ -292,9 +290,8 @@ socket_send_messages (NiceSocket *sock, const NiceAddress *to, { guint i; - /* Socket has been closed: */ - if (sock->priv == NULL) - return -1; + /* Make sure socket has not been freed: */ + g_assert (sock->priv != NULL); for (i = 0; i < n_messages; i++) { const NiceOutputMessage *message = &messages[i]; diff --git a/socket/udp-turn-over-tcp.c b/socket/udp-turn-over-tcp.c index 52c1189..2b91f92 100644 --- a/socket/udp-turn-over-tcp.c +++ b/socket/udp-turn-over-tcp.c @@ -136,9 +136,8 @@ socket_recv_message (NiceSocket *sock, NiceInputMessage *recv_message) GInputVector local_recv_buf; NiceInputMessage local_recv_message; - /* Socket has been closed: */ - if (sock->priv == NULL) - return 0; + /* Make sure socket has not been freed: */ + g_assert (sock->priv != NULL); if (priv->expecting_len == 0) { guint headerlen = 0; @@ -243,9 +242,8 @@ socket_recv_messages (NiceSocket *nicesock, guint i; gboolean error = FALSE; - /* Socket has been closed: */ - if (nicesock->priv == NULL) - return 0; + /* Make sure socket has not been freed: */ + g_assert (nicesock->priv != NULL); for (i = 0; i < n_recv_messages; i++) { gssize len; @@ -287,9 +285,8 @@ socket_send_message (NiceSocket *sock, const NiceAddress *to, } header_buf; guint offset = 0; - /* Socket has been closed: */ - if (sock->priv == NULL) - return -1; + /* Make sure socket has not been freed: */ + g_assert (sock->priv != NULL); /* Count the number of buffers. */ if (message->n_buffers == -1) { @@ -388,9 +385,8 @@ socket_send_messages (NiceSocket *sock, const NiceAddress *to, { guint i; - /* Socket has been closed: */ - if (sock->priv == NULL) - return -1; + /* Make sure socket has not been freed: */ + g_assert (sock->priv != NULL); for (i = 0; i < n_messages; i++) { const NiceOutputMessage *message = &messages[i]; diff --git a/socket/udp-turn.c b/socket/udp-turn.c index 0ab99f3..617e4f3 100644 --- a/socket/udp-turn.c +++ b/socket/udp-turn.c @@ -341,9 +341,8 @@ socket_recv_messages (NiceSocket *sock, gboolean error = FALSE; guint n_valid_messages; - /* Socket has been closed: */ - if (sock->priv == NULL) - return 0; + /* Make sure socket has not been freed: */ + g_assert (sock->priv != NULL); nice_debug_verbose ("received message on TURN socket"); @@ -700,9 +699,8 @@ socket_send_message (NiceSocket *sock, const NiceAddress *to, ChannelBinding *binding = NULL; gint ret; - /* Socket has been closed: */ - if (sock->priv == NULL) - return -1; + /* Make sure socket has not been freed: */ + g_assert (sock->priv != NULL); for (i = priv->channels; i; i = i->next) { ChannelBinding *b = i->data; @@ -876,9 +874,8 @@ socket_send_messages (NiceSocket *sock, const NiceAddress *to, { guint i; - /* Socket has been closed: */ - if (sock->priv == NULL) - return -1; + /* Make sure socket has not been freed: */ + g_assert (sock->priv != NULL); for (i = 0; i < n_messages; i++) { const NiceOutputMessage *message = &messages[i]; |