diff options
| author | Martin Storsjö <martin@martin.st> | 2011-06-16 11:04:27 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2011-06-16 17:40:28 +0300 |
| commit | d840733937a3f00dcedbf20507077a4891173516 (patch) | |
| tree | 0548b8d43d3eb5015649b03b93ec0a45b27c0a07 | |
| parent | 6095388812ce1b2a95e9917b89e5857639208f88 (diff) | |
| download | ffmpeg-d840733937a3f00dcedbf20507077a4891173516.tar.gz | |
rtsp: Don't pass string pointer as format string to ff_url_join
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ö <martin@martin.st>
| -rw-r--r-- | libavformat/rtsp.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) { |