Changeset 12416 for trunk/libtransmission/metainfo.c

Timestamp:

May 5, 2011, 3:10:51 AM (11 years ago)

Author:

jordan

Message:

(trunk libT) #4227 "invalid URLs aren't filtered out of .torrents' webseed lists"

If we can't parse a URL provided in the .torrent files' webseed list, that URL should be discarded.

File:

• trunk/libtransmission/metainfo.c (modified) (1 diff)

trunk/libtransmission/metainfo.c

@@ -371 +371 @@
 
         for( i = 0; i < n; ++i )
+        {
             if( tr_bencGetStr( tr_bencListChild( urls, i ), &url ) )
-                inf->webseeds[inf->webseedCount++] = tr_strdup( url );
+            {
+                const size_t len = strlen( url );
+
+                if( tr_urlIsValid( url, len  ) )
+                    inf->webseeds[inf->webseedCount++] = tr_strndup( url, len );
+            }
+        }
     }
     else if( tr_bencDictFindStr( meta, "url-list", &url ) ) /* handle single items in webseeds */
     {
-        inf->webseedCount = 1;
-        inf->webseeds = tr_new0( char*, 1 );
-        inf->webseeds[0] = tr_strdup( url );
+        const size_t len = strlen( url );
+
+        if( tr_urlIsValid( url, len  ) )
+        {
+            inf->webseedCount = 1;
+            inf->webseeds = tr_new0( char*, 1 );
+            inf->webseeds[0] = tr_strndup( url, len );
+        }
     }
 }