[Pkg-telepathy-commits] [libnice] 219/265: pseudotcp: Fix an assertion on an invalid calculated RTT

[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 8184eba65182293017f83371f7c465f5ce3c0c9d
Author: Philip Withnall <philip.withnall at collabora.co.uk>
Date:   Wed Apr 16 12:43:20 2014 +0100

    pseudotcp: Fix an assertion on an invalid calculated RTT
    
    If a packet has an invalid tsecr field, invalid (e.g. negative) RTTs may
    be calculated from it. If so, discard the packet as invalid.
---
 agent/pseudotcp.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/agent/pseudotcp.c b/agent/pseudotcp.c
index ba49c7a..726335d 100644
--- a/agent/pseudotcp.c
+++ b/agent/pseudotcp.c
@@ -1302,7 +1302,8 @@ process(PseudoTcpSocket *self, Segment *seg)
         DEBUG (PSEUDO_TCP_DEBUG_VERBOSE, "rtt: %ld   srtt: %d  rto: %d",
                 rtt, priv->rx_srtt, priv->rx_rto);
       } else {
-        g_assert_not_reached ();
+        DEBUG (PSEUDO_TCP_DEBUG_NORMAL, "Invalid RTT: %ld", rtt);
+        return FALSE;
       }
     }
 

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