highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use ff_url_join for assembling URLs, instead of snprintf

Browse Source 
This ensures proper escaping of numerical IPv6 addresses.

The RTSP (de)muxer needs its own network initialization, since it isn't
a protocol and url_open hasn't been called yet.

Originally committed as revision 22226 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Martin Storsjö
2010-03-05 22:35:21 +00:00
parent 780d7897a9
commit 57b5555c91
6 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/rtpproto.c
View File

@ -67,10 +67,10 @@ int rtp_set_remote_url(URLContext *h, const char *uri)
url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port,
path, sizeof(path), uri);
snprintf(buf, sizeof(buf), "udp://%s:%d%s", hostname, port, path);
ff_url_join(buf, sizeof(buf), "udp", NULL, hostname, port, "%s", path);
udp_set_remote_url(s->rtp_hd, buf);
snprintf(buf, sizeof(buf), "udp://%s:%d%s", hostname, port + 1, path);
ff_url_join(buf, sizeof(buf), "udp", NULL, hostname, port + 1, "%s", path);
udp_set_remote_url(s->rtcp_hd, buf);
return 0;
}
@ -101,7 +101,7 @@ static void build_udp_url(char *buf, int buf_size,
int local_port, int ttl,
int max_packet_size)
{
snprintf(buf, buf_size, "udp://%s:%d", hostname, port);
ff_url_join(buf, buf_size, "udp", NULL, hostname, port, NULL);
if (local_port >= 0)
url_add_option(buf, buf_size, "localport=%d", local_port);
if (ttl >= 0)