[Pkg-telepathy-commits] [libnice] 183/265: agent: Bail out early on empty message

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository libnice.

commit 5987a939e61b034d675c0227b0b5be7748c7754f
Author: Olivier Crête <olivier.crete at collabora.com>
Date:   Thu Mar 27 17:55:01 2014 -0400

    agent: Bail out early on empty message
    
    This can happen if a lower layer has consumed the message, bail out earlier in
    that case.
---
 agent/agent.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/agent/agent.c b/agent/agent.c
index 569c66e..03ae14a 100644
--- a/agent/agent.c
+++ b/agent/agent.c
@@ -2726,7 +2726,12 @@ agent_recv_message_unlocked (
     goto done;
   }
 
-  if (nice_debug_is_enabled () && message->length > 0) {
+  if (retval == RECV_OOB || message->length == 0) {
+    retval = RECV_OOB;
+    goto done;
+  }
+
+  if (nice_debug_is_enabled ()) {
     gchar tmpbuf[INET6_ADDRSTRLEN];
     nice_address_to_string (message->from, tmpbuf);
     nice_debug ("Agent %p : Packet received on local socket %d from [%s]:%u (%" G_GSSIZE_FORMAT " octets).", agent,
@@ -2750,11 +2755,16 @@ agent_recv_message_unlocked (
       if (cand->type == NICE_CANDIDATE_TYPE_RELAYED &&
           cand->stream_id == stream->id &&
           cand->component_id == component->id) {
-        nice_turn_socket_parse_recv_message (cand->sockptr, &socket, message);
+        retval = nice_turn_socket_parse_recv_message (cand->sockptr, &socket,
+            message);
+        break;
       }
     }
   }
 
+  if (retval == RECV_OOB)
+    goto done;
+
   agent->media_after_tick = TRUE;
 
   /* If the message’s stated length is equal to its actual length, it’s probably
@@ -2806,7 +2816,7 @@ agent_recv_message_unlocked (
       nice_debug ("%s: Queued %" G_GSSIZE_FORMAT " bytes for agent %p.",
           G_STRFUNC, vec->size, agent);
 
-      return 0;
+      return RECV_OOB;
     } else {
       process_queued_tcp_packets (agent, stream, component);
     }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/libnice.git