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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       09/10/22 20:02:08

Modified files:
        distrib        : ChangeLog 
        src/networks/direct_connect: dcShared.ml 

Log message:
        patch #6959

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1400&r2=1.1401
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/direct_connect/dcShared.ml?cvsroot=mldonkey&r1=1.2&r2=1.3

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1400
retrieving revision 1.1401
diff -u -b -r1.1400 -r1.1401
--- distrib/ChangeLog   22 Oct 2009 19:58:45 -0000      1.1400
+++ distrib/ChangeLog   22 Oct 2009 20:02:08 -0000      1.1401
@@ -15,6 +15,7 @@
 =========
 
 2009/10/22
+6959: DC: Fix invalid XML (lucasn)
 6804: EDK: Log incoming chat messages with ip:port info (Dennis Nezic)
 6772: New option max_result_name_len, shortens strings in
       HTML/Telnet search results

Index: src/networks/direct_connect/dcShared.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/direct_connect/dcShared.ml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/networks/direct_connect/dcShared.ml     2 Jan 2008 16:15:53 -0000       
1.2
+++ src/networks/direct_connect/dcShared.ml     22 Oct 2009 20:02:08 -0000      
1.3
@@ -86,6 +86,9 @@
       if dirname = "" then ntabs else begin
         buf_tabs buf ntabs;
         let dir = dirname in
+        (* Escape some special XML characters that may appear in the dirname *)
+        let dir = Str.global_replace (Str.regexp "'") "&apos;" dir in
+        let dir = Str.global_replace (Str.regexp "&") "&amp;" dir in
         Printf.bprintf buf "<Directory Name=\"%s\">\r\n" dir;
         ntabs+1
       end
@@ -93,6 +96,9 @@
     List.iter (fun dcsh ->
       buf_tabs buf ntabs;
       let fname = Filename2.basename dcsh.dc_shared_codedname in
+      (* Escape some special XML characters that may appear in the filename *)
+      let fname = Str.global_replace (Str.regexp "'") "&apos;" fname in
+      let fname = Str.global_replace (Str.regexp "&") "&amp;" fname in
       Printf.bprintf buf "<File Name=\"%s\" Size=\"%Ld\" TTH=\"%s\"/>\r\n" 
fname 
         dcsh.dc_shared_size dcsh.dc_shared_tiger_root
     ) node.shared_files;