[FFmpeg-devel] [PATCH] libavformat/rtsp.c: Avoids duplicated slashes in the RTSP URL Signed-off-by: Frederic Pillonel <fpi at gmx.ch>

[Michael Niedermayer]

On Wed, Jan 23, 2019 at 08:11:48AM +0000, fpi at gmx.ch wrote:
> From: Frederic Pillonel <fpi at gmx.ch>
> 
> ---
>  libavformat/rtsp.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
> index ceb770a..3cc9012f 100644
> --- a/libavformat/rtsp.c
> +++ b/libavformat/rtsp.c
> @@ -548,9 +548,10 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1,
>                               NULL, NULL, 0, p);
>                  if (proto[0] == '\0') {
>                      /* relative control URL */
> -                    if (rtsp_st->control_url[strlen(rtsp_st->control_url)-1]!='/')
> -                    av_strlcat(rtsp_st->control_url, "/",
> -                               sizeof(rtsp_st->control_url));
> +                    if (rtsp_st->control_url[strlen(rtsp_st->control_url)-1]!='/' &&
> +                                (strlen(p) > 0 && p[0]!='/'))
> +                        av_strlcat(rtsp_st->control_url, "/",
> +                                    sizeof(rtsp_st->control_url));

is this actually correct ?
if the added path starts with a / shouldnt it be an absolute path ?
IIUC https://tools.ietf.org/html/rfc1808 needs to be followed here

thx

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

The worst form of inequality is to try to make unequal things equal.
-- Aristotle
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20190124/32863cc1/attachment.sig>