Changeset 5712

Timestamp:

Apr 27, 2008, 6:27:32 PM (14 years ago)

Author:

charles

Message:

fix one of the crash-on-shutdown bugs reported by Gimp_

File:

• trunk/libtransmission/web.c (modified) (2 diffs)

trunk/libtransmission/web.c

@@ -124 +124 @@
 {
     struct tr_web_task * task = vtask;
-    struct tr_web * web = task->session->web;
-    CURL * ch;
-
-    ++web->remain;
-    dbgmsg( "adding task #%lu [%s] (%d remain)", task->tag, task->url, web->remain );
-
-    ch = curl_easy_init( );
-    curl_easy_setopt( ch, CURLOPT_PRIVATE, task );
-    curl_easy_setopt( ch, CURLOPT_URL, task->url );
-    curl_easy_setopt( ch, CURLOPT_WRITEFUNCTION, writeFunc );
-    curl_easy_setopt( ch, CURLOPT_WRITEDATA, task );
-    curl_easy_setopt( ch, CURLOPT_USERAGENT, TR_NAME "/" LONG_VERSION_STRING );
-    curl_easy_setopt( ch, CURLOPT_SSL_VERIFYPEER, 0 );
-    curl_easy_setopt( ch, CURLOPT_FORBID_REUSE, 1 );
-    curl_easy_setopt( ch, CURLOPT_NOSIGNAL, 1 );
-    curl_easy_setopt( ch, CURLOPT_FOLLOWLOCATION, 1 );
-    curl_easy_setopt( ch, CURLOPT_MAXREDIRS, 5 );
-    curl_easy_setopt( ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4 );
-    curl_easy_setopt( ch, CURLOPT_ENCODING, "" );
-    curl_multi_add_handle( web->cm, ch );
-
-    pump( web );
+
+    if( task->session && task->session->web )
+    {
+        struct tr_web * web = task->session->web;
+        CURL * ch;
+
+        ++web->remain;
+        dbgmsg( "adding task #%lu [%s] (%d remain)", task->tag, task->url, web->remain );
+
+        ch = curl_easy_init( );
+        curl_easy_setopt( ch, CURLOPT_PRIVATE, task );
+        curl_easy_setopt( ch, CURLOPT_URL, task->url );
+        curl_easy_setopt( ch, CURLOPT_WRITEFUNCTION, writeFunc );
+        curl_easy_setopt( ch, CURLOPT_WRITEDATA, task );
+        curl_easy_setopt( ch, CURLOPT_USERAGENT, TR_NAME "/" LONG_VERSION_STRING );
+        curl_easy_setopt( ch, CURLOPT_SSL_VERIFYPEER, 0 );
+        curl_easy_setopt( ch, CURLOPT_FORBID_REUSE, 1 );
+        curl_easy_setopt( ch, CURLOPT_NOSIGNAL, 1 );
+        curl_easy_setopt( ch, CURLOPT_FOLLOWLOCATION, 1 );
+        curl_easy_setopt( ch, CURLOPT_MAXREDIRS, 5 );
+        curl_easy_setopt( ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4 );
+        curl_easy_setopt( ch, CURLOPT_ENCODING, "" );
+        curl_multi_add_handle( web->cm, ch );
+
+        pump( web );
+    }
 }
 
@@ -154 +158 @@
            void               * done_func_user_data )
 {
-    static unsigned long tag = 0;
-    struct tr_web_task * task;
-
-    task = tr_new0( struct tr_web_task, 1 );
-    task->session = session;
-    task->url = tr_strdup( url );
-    task->done_func = done_func;
-    task->done_func_user_data = done_func_user_data;
-    task->tag = ++tag;
-    task->response = evbuffer_new( );
-
-    tr_runInEventThread( session, addTask, task );
+    if( session->web )
+    {
+        static unsigned long tag = 0;
+        struct tr_web_task * task;
+
+        task = tr_new0( struct tr_web_task, 1 );
+        task->session = session;
+        task->url = tr_strdup( url );
+        task->done_func = done_func;
+        task->done_func_user_data = done_func_user_data;
+        task->tag = ++tag;
+        task->response = evbuffer_new( );
+
+        tr_runInEventThread( session, addTask, task );
+    }
 }