diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-02-13 12:47:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-20 03:41:32 +0200 |
| commit | 02c51f323255809b664d6224520ea9ed7573fe3c (patch) | |
| tree | 1965a39bc2397d6cdbb359816b921dd949e453dd | |
| parent | a1ad585c8ef1ec2f00f70ada99af0c67834fd23c (diff) | |
| download | ffmpeg-02c51f323255809b664d6224520ea9ed7573fe3c.tar.gz | |
avformat/http: Check for truncated buffers in http_connect()
Reported-by: SleepProgger <security@gnutp.com>
Reviewed-by: Steven Liu <lingjiujianke@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 8fa18e042ad2c078f759692f1db5629d16d70595)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/http.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/libavformat/http.c b/libavformat/http.c index d2e9ae1619..7686c92742 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -989,6 +989,7 @@ static int http_connect(URLContext *h, const char *path, const char *local_path, int len = 0; const char *method; int send_expect_100 = 0; + int ret; /* send http header */ post = h->flags & AVIO_FLAG_WRITE; @@ -1079,7 +1080,7 @@ static int http_connect(URLContext *h, const char *path, const char *local_path, if (s->headers) av_strlcpy(headers + len, s->headers, sizeof(headers) - len); - snprintf(s->buffer, sizeof(s->buffer), + ret = snprintf(s->buffer, sizeof(s->buffer), "%s %s HTTP/1.1\r\n" "%s" "%s" @@ -1095,6 +1096,14 @@ static int http_connect(URLContext *h, const char *path, const char *local_path, av_log(h, AV_LOG_DEBUG, "request: %s\n", s->buffer); + if (strlen(headers) + 1 == sizeof(headers) || + ret >= sizeof(s->buffer)) { + av_log(h, AV_LOG_ERROR, "overlong headers\n"); + err = AVERROR(EINVAL); + goto done; + } + + if ((err = ffurl_write(s->hd, s->buffer, strlen(s->buffer))) < 0) goto done; |