Fix browsing directories containing the '&' character

diff --git a/share/http/js/functions.js b/share/http/js/functions.js
index 4ec161f4ec7edf25f3a9caf518052e0136d63812..2304c1ba7c10acebb53c48bc4586c60ff2dd5f25 100644 (file)
--- a/share/http/js/functions.js
+++ b/share/http/js/functions.js
@@ -931,7 +931,7 @@ function browse( dest )
 function browse_dir( dir )
 {
     document.getElementById( 'browse_lastdir' ).value = dir;
-    loadXMLDoc( 'requests/browse.xml?dir='+dir, parse_browse_dir );
+    loadXMLDoc( 'requests/browse.xml?dir='+escape(dir), parse_browse_dir );
 }
 function browse_path( p )
 {

diff --git a/share/http/requests/browse.xml b/share/http/requests/browse.xml
index ad4d8b7402fe73f34915ce32a99313625376a28e..03470ac83b0048c88828c1b402df29e479d96923 100644 (file)
--- a/share/http/requests/browse.xml
+++ b/share/http/requests/browse.xml
@@ -29,7 +29,7 @@
   <vlc id="rpn" param1="'dir' url_extract" />
   <vlc id="foreach" param1="file" param2="directory" />
     <vlc id="if" param1="file.basename value '.' 1 strncmp 0 != file.basename value '..' 2 strncmp 0 = |" />
-      <element type="<vlc id="value" param1="file.type" />" size="<vlc id="value" param1="file.size" />" date="<vlc id="value" param1="file.size" />" path="<vlc id="value" param1="file.name" />" name="<vlc id="value" param1="file.basename" />" />  
+      <element type="<vlc id="value" param1="file.type" />" size="<vlc id="value" param1="file.size" />" date="<vlc id="value" param1="file.size" />" path="<vlc id="value" param1="file.name value htmlspecialchars" />" name="<vlc id="value" param1="file.basename value htmlspecialchars" />" />  
     <vlc id="end" />
   <vlc id="end" />
 <vlc id="end" />