[FFmpeg-devel] [PATCH] Avoids duplicated slashes in the RTSP URL. Signed-off-by: Frederic Pillonel

2019-01-22 Thread fpi 
From: Frederic Pillonel 

---
 libavformat/rtsp.c | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index ceb770a3a4..20f63e0e01 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]!='/' &&
+(sizeof(p) > 0 && p[0]!='/'))
+av_strlcat(rtsp_st->control_url, "/",
+sizeof(rtsp_st->control_url));
 av_strlcat(rtsp_st->control_url, p,
sizeof(rtsp_st->control_url));
 } else
-- 
2.20.1.windows.1

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

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

2019-01-23 Thread fpi 
From: Frederic Pillonel 

---
 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));
 av_strlcat(rtsp_st->control_url, p,
sizeof(rtsp_st->control_url));
 } else
-- 
2.1.4

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel