summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2010-05-24 19:23:31 +0000
committerMartin Storsjö <martin@martin.st>2010-05-24 19:23:31 +0000
commitc966c91279f8bca0f1d4865779519b077a2221f0 (patch)
tree909b235415faec1ae28d7c3b7fea218752fd384d
parent9cc9a155100d4364ad02d50e89b313ec94195102 (diff)
downloadffmpeg-streaming-c966c91279f8bca0f1d4865779519b077a2221f0.zip
ffmpeg-streaming-c966c91279f8bca0f1d4865779519b077a2221f0.tar.gz
ffserver: Fix an out of bounds read
Fix by Howard Chu, hyc at highlandsun dot com Originally committed as revision 23292 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--ffserver.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ffserver.c b/ffserver.c
index 4217735..e3b53fb 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -2880,7 +2880,7 @@ static int rtsp_parse_request(HTTPContext *c)
if (*p == '\n')
p++;
while (*p != '\0') {
- p1 = strchr(p, '\n');
+ p1 = memchr(p, '\n', (char *)c->buffer_ptr - p);
if (!p1)
break;
p2 = p1;
OpenPOWER on IntegriCloud