Changeset 3285

Timestamp:

Oct 4, 2007, 8:31:19 PM (15 years ago)

Author:

charles

Message:

fix the crash reported by Waldorf and John_Clay

Location:

trunk/libtransmission

Files:

• handshake.c (modified) (2 diffs)
• peer-mgr.c (modified) (1 diff)
• tracker.c (modified) (3 diffs)
• utils.c (modified) (1 diff)

trunk/libtransmission/handshake.c

@@ -577 +577 @@
     uint8_t reserved[HANDSHAKE_FLAGS_LEN];
     uint8_t hash[SHA_DIGEST_LENGTH];
+    char * client;
 
 /* FIXME: use  readHandshake here */
@@ -667 +668 @@
     tr_peerIoSetPeersId( handshake->io, handshake->peer_id );
     handshake->havePeerID = TRUE;
-    dbgmsg( handshake, "peer-id is [%s]", tr_clientForId(handshake->peer_id) );
+    client = tr_clientForId( handshake->peer_id );
+    dbgmsg( handshake, "peer-id is [%s]", client );
+    tr_free( client );
     if( !memcmp( handshake->peer_id, getPeerId(), PEER_ID_LEN ) ) {
         dbgmsg( handshake, "streuth!  we've connected to ourselves." );

trunk/libtransmission/peer-mgr.c

@@ -405 +405 @@
     tr_ptrArrayFree( t->pool, (PtrArrayForeachFunc)tr_free );
     tr_ptrArrayFree( t->outgoingHandshakes, NULL );
+    tr_ptrArrayFree( t->peers, NULL );
 
     tr_free( t );

trunk/libtransmission/tracker.c

@@ -738 +738 @@
 torrentIsRunning( const Torrent * tor )
 {
-    return ( tor != NULL )
-        && ( tor->lastRequest != NULL )
-        && ( strcmp( tor->lastRequest, "stopped" ) );
+    return tor && tor->isRunning;
 }
 
@@ -841 +839 @@
 static int onReannounceNow( void * vtor );
 
-static void
-onTrackerResponse( struct evhttp_request * req, void * vtor )
+struct response_user_data
+{
+    tr_handle * handle;
+    uint8_t hash[SHA_DIGEST_LENGTH];
+};
+
+static struct response_user_data*
+onTrackerResponseDataNew( Torrent * tor )
+{
+    struct response_user_data * data = tr_new( struct response_user_data, 1 );
+    data->handle = tor->tracker->handle;
+    memcpy( data->hash, tor->hash, SHA_DIGEST_LENGTH );
+    return data;
+}
+
+static void
+onTrackerResponse( struct evhttp_request * req, void * vdata )
 {
     char * errmsg;
-    Torrent * tor = (Torrent *) vtor;
-    const int isStopped = !torrentIsRunning( tor );
+    Torrent * tor;
+    int isStopped;
     int reannounceInterval;
+    struct response_user_data * data;
+    tr_torrent * t;
+
+    data = vdata;
+    t = tr_torrentFindFromHash( data->handle, data->hash );
+    tr_free( data );
+    if( t == NULL ) /* torrent has been closed */
+        return;
+
+    tor = t->tracker;
+    isStopped = !torrentIsRunning( tor );
 
     tr_inf( "Torrent \"%s\" tracker response: %s",
@@ -977 +1001 @@
         t->lastRequest = tr_strdup( eventName );
         evhttp_connection_set_timeout( evcon, REQ_TIMEOUT_INTERVAL_SEC );
-        httpReq = evhttp_request_new( onTrackerResponse, t );
+        httpReq = evhttp_request_new( onTrackerResponse, onTrackerResponseDataNew(t) );
         addCommonHeaders( t->tracker, httpReq );
         tr_evhttp_make_request( t->tracker->handle, evcon,

trunk/libtransmission/utils.c

@@ -686 +686 @@
 }
 
-void tr_free( void * p )
+void
+tr_free( void * p )
 {
     if( p )