[FFmpeg-cvslog] avformat/http: return EINVAL from ff_http_do_new_request() if re-used with different hostname

[Aman Gupta]

ffmpeg | branch: master | Aman Gupta <aman at tmm1.net> | Tue Dec 12 15:50:44 2017 -0800| [28358e466d4f4bc54f8137e0597057f33100b236] | committer: Aman Gupta

avformat/http: return EINVAL from ff_http_do_new_request() if re-used with different hostname

This will prevent improper use of ff_http_do_new_request() if the user
tries to send a request for a different host to a previously connected
persistent http/1.1 connection.

Signed-off-by: Aman Gupta <aman at tmm1.net>
Signed-off-by: Karthick J <kjeyapal at akamai.com>

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

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

diff --git a/libavformat/http.c b/libavformat/http.c
index cf86adc617..a3c36423fc 100644
--- a/libavformat/http.c
+++ b/libavformat/http.c
@@ -306,6 +306,22 @@ int ff_http_do_new_request(URLContext *h, const char *uri)
     HTTPContext *s = h->priv_data;
     AVDictionary *options = NULL;
     int ret;
+    char hostname1[1024], hostname2[1024], proto1[10], proto2[10];
+    int port1, port2;
+
+    av_url_split(proto1, sizeof(proto1), NULL, 0,
+                 hostname1, sizeof(hostname1), &port1,
+                 NULL, 0, s->location);
+    av_url_split(proto2, sizeof(proto2), NULL, 0,
+                 hostname2, sizeof(hostname2), &port2,
+                 NULL, 0, uri);
+    if (port1 != port2 || strncmp(hostname1, hostname2, sizeof(hostname2)) != 0) {
+        av_log(h, AV_LOG_ERROR, "Cannot reuse HTTP connection for different host: %s:%d != %s:%d\n",
+            hostname1, port1,
+            hostname2, port2
+        );
+        return AVERROR(EINVAL);
+    }
 
     ret = http_shutdown(h, h->flags);
     if (ret < 0)