Changeset 10152

Timestamp:

Feb 10, 2010, 3:26:19 AM (12 years ago)

Author:

charles

Message:

(trunk libT) #2887 "dangling pointer in 1.81" -- fixed in trunk for 1.90 / 1.8x

File:

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

trunk/libtransmission/web.c

@@ -91 +91 @@
     struct evbuffer * response;
     char * url;
+    char * resolved_url;
     char * host;
     const char * resolved_host;
@@ -113 +114 @@
     tr_free( task->host );
     tr_free( task->range );
+    tr_free( task->resolved_url );
     tr_free( task->url );
     memset( task, TR_MEMORY_TRASH, sizeof( struct tr_web_task ) );
@@ -323 +325 @@
         const long verbose = getenv( "TR_CURL_VERBOSE" ) != NULL;
         const char * user_agent = TR_NAME "/" SHORT_VERSION_STRING;
-        char * url = NULL;
 
         /* insert the resolved host into the URL s.t. curl's DNS won't block
@@ -337 +338 @@
             evbuffer_add_printf( buf, "%s", task->resolved_host );
             evbuffer_add_printf( buf, "%s", tail );
-            url = tr_strndup( EVBUFFER_DATA( buf ), EVBUFFER_LENGTH( buf ) );
-            dbgmsg( "old url: \"%s\" -- new url: \"%s\"", task->url, url );
+            task->resolved_url = tr_strndup( EVBUFFER_DATA( buf ), EVBUFFER_LENGTH( buf ) );
+            dbgmsg( "old url: \"%s\" -- new url: \"%s\"", task->url, task->resolved_url );
             evbuffer_free( buf );
 
@@ -355 +356 @@
         }
 
-        dbgmsg( "adding task #%lu [%s]", task->tag, url ? url : task->url );
+        dbgmsg( "adding task #%lu [%s]", task->tag, task->resolved_url ? task->resolved_url : task->url );
 
         if( !task->range && session->isProxyEnabled ) {
@@ -390 +391 @@
         curl_easy_setopt( e, CURLOPT_SSL_VERIFYHOST, 0L );
         curl_easy_setopt( e, CURLOPT_SSL_VERIFYPEER, 0L );
-        curl_easy_setopt( e, CURLOPT_URL, url ? url : task->url );
+        curl_easy_setopt( e, CURLOPT_URL, task->resolved_url ? task->resolved_url : task->url );
         curl_easy_setopt( e, CURLOPT_USERAGENT, user_agent );
         curl_easy_setopt( e, CURLOPT_VERBOSE, verbose );
@@ -400 +401 @@
         if( curl_multi_add_handle( web->multi, e ) == CURLM_OK )
             ++web->taskCount;
-
-        tr_free( url );
     }
 }