generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Fixes Ticket3034

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 885739f3b4)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-10-09 00:30:46 +02:00
parent b8b77aefe8
commit da82be0cc0
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ffserver.c
View File

@@ -328,6 +328,14 @@ static AVLFG random_state;
static FILE *logfile = NULL; 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) static int64_t ffm_read_write_index(int fd)
{ {
uint8_t buf[8]; uint8_t buf[8];
@@ -1887,6 +1895,7 @@ static int http_parse_request(HTTPContext *c)
send_error: send_error:
c->http_error = 404; c->http_error = 404;
q = c->buffer; q = c->buffer;
htmlstrip(msg);
snprintf(q, c->buffer_size, snprintf(q, c->buffer_size,
"HTTP/1.0 404 Not Found\r\n" "HTTP/1.0 404 Not Found\r\n"
"Content-type: text/html\r\n" "Content-type: text/html\r\n"