[FFmpeg-cvslog] avformat/http: return EINVAL if ff_http_do_new_request is called with non-http URLContext

Aman Gupta git at videolan.org
Sat Dec 30 19:59:27 EET 2017


ffmpeg | branch: master | Aman Gupta <aman at tmm1.net> | Fri Dec 29 15:25:14 2017 -0800| [c0b08ef94f037572876448990dca840b85432262] | committer: Aman Gupta

avformat/http: return EINVAL if ff_http_do_new_request is called with non-http URLContext

Signed-off-by: Aman Gupta <aman at tmm1.net>

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

 libavformat/http.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libavformat/http.c b/libavformat/http.c
index a376f1a488..8f7e56de54 100644
--- a/libavformat/http.c
+++ b/libavformat/http.c
@@ -311,6 +311,11 @@ int ff_http_do_new_request(URLContext *h, const char *uri)
     char hostname1[1024], hostname2[1024], proto1[10], proto2[10];
     int port1, port2;
 
+    if (!h->prot ||
+        !(!strcmp(h->prot->name, "http") ||
+          !strcmp(h->prot->name, "https")))
+        return AVERROR(EINVAL);
+
     av_url_split(proto1, sizeof(proto1), NULL, 0,
                  hostname1, sizeof(hostname1), &port1,
                  NULL, 0, s->location);



More information about the ffmpeg-cvslog mailing list