]> git.sesse.net Git - vlc/commitdiff
projects / vlc / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8cc28d2)
Fix possible XSS in httpd_HtmlError
authorJean-Baptiste Kempf <jb@videolan.org>
Tue, 18 Feb 2014 12:38:56 +0000 (13:38 +0100)
committerJean-Baptiste Kempf <jb@videolan.org>
Tue, 18 Feb 2014 12:38:56 +0000 (13:38 +0100)
Found by Francesco Perna and Pietro Minniti from Quantum Leap s.r.l
Quantum Leap Advisory: Adivsory #QLA140216

src/network/httpd.c patch | blob | history

diff --git a/src/network/httpd.c b/src/network/httpd.c
index 6f48e71375b6412023fab5f6693b9968f3addffd..92f074550dbca03b2d67de51000504ccd00e4d79 100644 (file)
--- a/src/network/httpd.c
+++ b/src/network/httpd.c
@@ -265,6 +265,8 @@ static size_t httpd_HtmlError (char **body, int code, const char *url)
     const char *errname = httpd_ReasonFromCode (code);
     assert (errname != NULL);
 
+    char *url_Encoded = convert_xml_special_chars (url ? url : "");
+
     int res = asprintf (body,
         "<?xml version=\"1.0\" encoding=\"ascii\" ?>\n"
         "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\""
@@ -279,7 +281,9 @@ static size_t httpd_HtmlError (char **body, int code, const char *url)
         "<a href=\"http://www.videolan.org\">VideoLAN</a>\n"
         "</body>\n"
         "</html>\n", errname, code, errname,
-        (url ? " (" : ""), (url ? url : ""), (url ? ")" : ""));
+        (url_Encoded ? " (" : ""), (url_Encoded ? url_Encoded : ""), (url_Encoded ? ")" : ""));
+
+    free (url_Encoded);
 
     if (res == -1)
     {
Unnamed repository; edit this file 'description' to name the repository.