From d840733937a3f00dcedbf20507077a4891173516 Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Thu, 16 Jun 2011 11:04:27 +0300 Subject: rtsp: Don't pass string pointer as format string to ff_url_join MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In this case, the string that was passed couldn't contain user-defined data and thus there was no risk for injection bugs, but it's safer this way, if we later change the content of the options string. Signed-off-by: Martin Storsjö --- libavformat/rtsp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavformat') diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index b2735f6165..eeea9be4a0 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1234,10 +1234,10 @@ int ff_rtsp_make_setup_request(AVFormatContext *s, const char *host, int port, if (reply->transports[0].source[0]) { ff_url_join(url, sizeof(url), "rtp", NULL, reply->transports[0].source, - reply->transports[0].server_port_min, options); + reply->transports[0].server_port_min, "%s", options); } else { ff_url_join(url, sizeof(url), "rtp", NULL, host, - reply->transports[0].server_port_min, options); + reply->transports[0].server_port_min, "%s", options); } if (!(rt->server_type == RTSP_SERVER_WMS && i > 1) && rtp_set_remote_url(rtsp_st->rtp_handle, url) < 0) { -- cgit v1.2.3