Changeset 6183

Timestamp:

Jun 13, 2008, 9:14:43 PM (15 years ago)

Author:

charles

Message:

(1.2x) #971: "transmission can't create torrent with empty Announce URL" backported to 1.2x

File:

• branches/1.2x/libtransmission/makemeta.c (modified) (1 diff)

branches/1.2x/libtransmission/makemeta.c

@@ -345 +345 @@
     int n = 5;
     tr_benc top;
+    const char * ann = builder->announce;
 
     if ( builder->comment && *builder->comment ) ++n;
     tr_bencInitDict( &top, n );
 
-    tr_bencDictAddStr( &top, "announce", builder->announce );
-
-    if( tr_httpParseURL( builder->announce, -1, NULL, NULL, NULL ) )
+    tr_bencDictAddStr( &top, "announce", ann );
+
+    /* if a URL was entered but it's invalid, don't allow it. #814, #971 */
+    if( ann && *ann && !tr_httpIsValidURL( ann ) )
         builder->result = TR_MAKEMETA_URL;