From c5be140c9ada97e754cf95ffd26ac6cd5192f770 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Thu, 18 Oct 2007 09:50:53 +0000 Subject: Make url_split() strip url options (?opt=var) from the returned hostname or location. This fixes a regression introduced by the rewrite of url_split() in r10605. Patch by Ronald S. Bultje: rsbultje gmail com Original thread: [FFmpeg-devel] [PATCH] Make RTP work with IPv6 enabled Date: 10/12/2007 08:19 PM Originally committed as revision 10775 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/utils.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'libavformat/utils.c') diff --git a/libavformat/utils.c b/libavformat/utils.c index c85b119b9e..cb03c89c3f 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2875,7 +2875,7 @@ void url_split(char *proto, int proto_size, char *path, int path_size, const char *url) { - const char *p, *ls, *at, *col, *brk; + const char *p, *ls, *at, *col, *brk, *q; if (port_ptr) *port_ptr = -1; if (proto_size > 0) proto[0] = 0; @@ -2896,9 +2896,12 @@ void url_split(char *proto, int proto_size, } /* separate path from hostname */ - if ((ls = strchr(p, '/'))) - av_strlcpy(path, ls, path_size); - else + if ((ls = strchr(p, '/'))) { + if ((q = strchr(ls, '?'))) + av_strlcpy(path, ls, FFMIN(path_size, q - ls + 1)); + else + av_strlcpy(path, ls, path_size); + } else if (!(ls = strchr(p, '?'))) ls = &p[strlen(p)]; // XXX /* the rest is hostname, use that to parse auth/port */ -- cgit v1.2.3