Changeset 3332

Timestamp:

Oct 8, 2007, 7:09:20 PM (15 years ago)

Author:

charles

Message:

fix crash reported by Waldorf in ​http://pastebin.ca/729980

File:

• trunk/libtransmission/tracker.c (modified) (4 diffs)

trunk/libtransmission/tracker.c

@@ -260 +260 @@
 
 static Tracker*
+getExistingTracker( const char * primaryAddress )
+{
+    tr_ptrArray * trackers = getTrackerLookupTable( );
+    Tracker tmp;
+    assert( primaryAddress && *primaryAddress );
+    tmp.primaryAddress = (char*) primaryAddress;
+    return tr_ptrArrayFindSorted( trackers, &tmp, trackerCompare );
+}
+
+static Tracker*
 tr_trackerGet( const tr_torrent * tor )
 {
     const tr_info * info = &tor->info;
-    tr_ptrArray * trackers = getTrackerLookupTable( );
-    Tracker *t, tmp;
-    assert( info != NULL );
-    assert( info->primaryAddress && *info->primaryAddress );
-    tmp.primaryAddress = info->primaryAddress;
-    t = tr_ptrArrayFindSorted( trackers, &tmp, trackerCompare );
-
-    assert( t==NULL || !strcmp(t->primaryAddress,info->primaryAddress) );
+    Tracker * t = getExistingTracker( info->primaryAddress );
 
     if( t == NULL ) /* no such tracker.... create one */
@@ -317 +320 @@
         assert( iwalk - t->tierFronts == sum );
 
-        tr_ptrArrayInsertSorted( trackers, t, trackerCompare );
+        tr_ptrArrayInsertSorted( getTrackerLookupTable( ), t, trackerCompare );
     }
 
@@ -554 +557 @@
 
 static void
-onScrapeResponse( struct evhttp_request * req, void * vt )
+onScrapeResponse( struct evhttp_request * req, void * primaryAddress )
 {
     char * errmsg;
-    Tracker * t = (Tracker*) vt;
+    Tracker * t;
 
     tr_inf( "Got scrape response from  '%s': %s",
-            t->primaryAddress,
+            primaryAddress,
             (req ? req->response_code_line : "(null)") );
+
+    t = getExistingTracker( primaryAddress );
+    tr_free( primaryAddress );
+    if( t == NULL ) /* tracker has been closed... */
+        return;
 
     if( req && ( req->response_code == HTTP_OK ) )
@@ -710 +718 @@
         evcon = getConnection( t, address->address, address->port );
         evhttp_connection_set_timeout( evcon, TIMEOUT_INTERVAL_SEC );
-        req = evhttp_request_new( onScrapeResponse, t );
+        req = evhttp_request_new( onScrapeResponse, tr_strdup(t->primaryAddress) );
         assert( req );
         addCommonHeaders( t, req );