virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

avformat/rtsp: Clear reply in every iteration in ff_rtsp_connect()

Browse Source 
Fixes: Infinite loop

Found-by: Michael Hanselmann <public@hansmi.ch>
Reviewed-by: Michael Hanselmann <public@hansmi.ch>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 0b50f27635)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2019-01-28 00:53:22 +01:00
parent c600c06af9
commit 636e66f350
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/rtsp.c
View File

@ -1663,7 +1663,7 @@ int ff_rtsp_connect(AVFormatContext *s)
char tcpname[1024], cmd[2048], auth[128]; char tcpname[1024], cmd[2048], auth[128];
const char *lower_rtsp_proto = "tcp"; const char *lower_rtsp_proto = "tcp";
int port, err, tcp_fd; int port, err, tcp_fd;
RTSPMessageHeader reply1 = {0}, *reply = &reply1; RTSPMessageHeader reply1, *reply = &reply1;
int lower_transport_mask = 0; int lower_transport_mask = 0;
int default_port = RTSP_DEFAULT_PORT; int default_port = RTSP_DEFAULT_PORT;
char real_challenge[64] = ""; char real_challenge[64] = "";
@ -1692,6 +1692,7 @@ int ff_rtsp_connect(AVFormatContext *s)
rt->lower_transport_mask &= (1 << RTSP_LOWER_TRANSPORT_NB) - 1; rt->lower_transport_mask &= (1 << RTSP_LOWER_TRANSPORT_NB) - 1;
redirect: redirect:
memset(&reply1, 0, sizeof(reply1));
/* extract hostname and port */ /* extract hostname and port */
av_url_split(proto, sizeof(proto), auth, sizeof(auth), av_url_split(proto, sizeof(proto), auth, sizeof(auth),
host, sizeof(host), &port, path, sizeof(path), s->url); host, sizeof(host), &port, path, sizeof(path), s->url);