Changeset 7423

Timestamp:

Dec 16, 2008, 11:31:05 PM (12 years ago)

Author:

charles

Message:

(trunk libT) more runtime safety checks

File:

• trunk/libtransmission/peer-mgr.c (modified) (5 diffs)

trunk/libtransmission/peer-mgr.c

@@ -1337 +1337 @@
 }
 
+static int
+tr_isPex( const tr_pex * pex )
+{
+    return pex && tr_isAddress( &pex->addr );
+}
+
 void
 tr_peerMgrAddPex( tr_peerMgr *    manager,
@@ -1344 +1350 @@
 {
     Torrent * t;
-
     managerLock( manager );
+
+    assert( tr_isPex( pex ) );
 
     t = getExistingTorrent( manager, torrentHash );
@@ -1464 +1471 @@
     const tr_pex * a = va;
     const tr_pex * b = vb;
-    int i = tr_compareAddresses( &a->addr, &b->addr );
-
-    if( i ) return i;
-    if( a->port < b->port ) return -1;
-    if( a->port > b->port ) return 1;
+    int i;
+
+    assert( tr_isPex( a ) );
+    assert( tr_isPex( b ) );
+
+    if(( i = tr_compareAddresses( &a->addr, &b->addr )))
+        return i;
+
+    if( a->port != b->port )
+        return a->port < b->port ? -1 : 1;
+
     return 0;
 }
@@ -1530 +1543 @@
         }
 
-#warning this for loop can be removed when we're sure the bug is fixed
+#warning this for loop can be removed when we are sure the bug is fixed
         for( i=0; i<peersReturning; ++i )
             assert( tr_isAddress( &pex[i].addr ) );
@@ -1537 +1550 @@
         qsort( pex, peersReturning, sizeof( tr_pex ), tr_pexCompare );
 
-#warning this for loop can be removed when we're sure the bug is fixed
+#warning this for loop can be removed when we are sure the bug is fixed
         for( i=0; i<peersReturning; ++i )
             assert( tr_isAddress( &pex[i].addr ) );