[FFmpeg-cvslog] ffserver: strip odd chars from html error messages before sending them back

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct  9 00:30:46 2013 +0200| [885739f3b4ca3fb60abf417120845e3fcfb99b53] | committer: Michael Niedermayer

ffserver: strip odd chars from html error messages before sending them back

Fixes Ticket3034

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=885739f3b4ca3fb60abf417120845e3fcfb99b53
---

 ffserver.c |    9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ffserver.c b/ffserver.c
index 6aaaeaf..5ecdb08 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -327,6 +327,14 @@ static AVLFG random_state;
 
 static FILE *logfile = NULL;
 
+static void htmlstrip(char *s) {
+    while (s && *s) {
+        s += strspn(s, "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ,. ");
+        if (*s)
+            *s++ = '?';
+    }
+}
+
 static int64_t ffm_read_write_index(int fd)
 {
     uint8_t buf[8];
@@ -1886,6 +1894,7 @@ static int http_parse_request(HTTPContext *c)
  send_error:
     c->http_error = 404;
     q = c->buffer;
+    htmlstrip(msg);
     snprintf(q, c->buffer_size,
                   "HTTP/1.0 404 Not Found\r\n"
                   "Content-type: text/html\r\n"