Changeset 5714

Timestamp:

Apr 28, 2008, 1:29:38 PM (14 years ago)

Author:

charles

Message:

fix another crash-on-shutdown in the new web code

Location:

trunk/libtransmission

Files:

• session.c (modified) (2 diffs)
• web.c (modified) (1 diff)
• web.h (modified) (1 diff)

trunk/libtransmission/session.c

@@ -386 +386 @@
 
 static void
-tr_closeImpl( void * vh )
+tr_closeAllConnections( void * vh )
 {
     tr_handle * h = vh;
     tr_torrent * t;
 
-    tr_webClose( h->web );
     tr_sharedShuttingDown( h->shared );
     tr_trackerShuttingDown( h );
-
-    _tr_blocklistFree( h->blocklist );
-    h->blocklist = NULL;
 
     for( t=h->torrentList; t!=NULL; ) {
@@ -429 +425 @@
     tr_statsClose( h );
 
-    tr_runInEventThread( h, tr_closeImpl, h );
+    tr_runInEventThread( h, tr_closeAllConnections, h );
     while( !h->isClosed && !deadlineReached( deadline ) )
         tr_wait( 100 );
+
+    _tr_blocklistFree( h->blocklist );
+    h->blocklist = NULL;
+    tr_webClose( &h->web );
 
     tr_eventClose( h );

trunk/libtransmission/web.c

@@ -320 +320 @@
 
 void
-tr_webClose( tr_web * web )
+tr_webClose( tr_web ** web )
 {
     dbgmsg( "deleting web->timer" );
-    evtimer_del( &web->timer );
-    curl_multi_cleanup( web->cm );
-    tr_free( web );
+    evtimer_del( &(*web)->timer );
+    curl_multi_cleanup( (*web)->cm );
+    tr_free( *web );
+    *web = NULL;
 }
 

trunk/libtransmission/web.h

@@ -19 +19 @@
 tr_web* tr_webInit( tr_handle * session );
 
-void tr_webClose( tr_web * );
+void tr_webClose( tr_web ** );
 
 typedef void (tr_web_done_func)( tr_handle    * session,