[Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/bittorr...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       09/10/23 05:29:42

Modified files:
        distrib        : ChangeLog 
        src/networks/bittorrent: bTTorrent.ml 

Log message:
        patch #6961

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1401&r2=1.1402
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTTorrent.ml?cvsroot=mldonkey&r1=1.17&r2=1.18

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1401
retrieving revision 1.1402
diff -u -b -r1.1401 -r1.1402
--- distrib/ChangeLog   22 Oct 2009 20:02:08 -0000      1.1401
+++ distrib/ChangeLog   23 Oct 2009 05:29:42 -0000      1.1402
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2009/10/23
+6961: BT: Fix torrent parsing when announce-list is empty
+
 2009/10/22
 6959: DC: Fix invalid XML (lucasn)
 6804: EDK: Log incoming chat messages with ip:port info (Dennis Nezic)

Index: src/networks/bittorrent/bTTorrent.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTTorrent.ml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- src/networks/bittorrent/bTTorrent.ml        22 Oct 2009 19:51:35 -0000      
1.17
+++ src/networks/bittorrent/bTTorrent.ml        23 Oct 2009 05:29:42 -0000      
1.18
@@ -169,7 +169,7 @@
                             announce_list := !next_urls @ !announce_list
                           end
                         else
-                          announce_list := List.hd !next_urls :: !announce_list
+                          announce_list := (try List.hd !next_urls with _ -> 
"") :: !announce_list
                     | _ ->
                         lprintf_nl "[BT] unknown field in announce list"
                     ) list;