Changeset 7623

Timestamp:

Jan 6, 2009, 12:24:44 AM (12 years ago)

Author:

charles

Message:

(trunk libT) two bugfixes in one: (1) fix leaking tr_handshake objects reported by BentMyWookie? (2) fix yet another permutation of the tr_isBandwidth() assertion failure -- maybe the last one? -- reported by Waldorf

Location:

trunk/libtransmission

Files:

• handshake.c (modified) (2 diffs)
• handshake.h (modified) (1 diff)
• peer-mgr.c (modified) (1 diff)

trunk/libtransmission/handshake.c

@@ -1092 +1092 @@
 }
 
-void
+static void
 tr_handshakeFree( tr_handshake * handshake )
 {
@@ -1111 +1111 @@
 
     success = fireDoneFunc( handshake, isOK );
+
+    tr_handshakeFree( handshake );    
 
     return success ? READ_LATER : READ_ERR;

trunk/libtransmission/handshake.h

@@ -39 +39 @@
                                             tr_port                    * port );
 
-void                   tr_handshakeFree( tr_handshake * handshake );
-
 void                   tr_handshakeAbort( tr_handshake * handshake );
 

trunk/libtransmission/peer-mgr.c

@@ -1269 +1269 @@
     }
 
-    if( !success )
-        tr_handshakeFree( handshake );
-
     if( t )
         torrentUnlock( t );