generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/ftp: fix possible deadlock

Browse Source 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
This commit is contained in:
Lukasz Marek 2013-10-12 12:53:54 +02:00
parent 7b1640c4a6
commit e1fb3143bb
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavformat/ftp.c
View File

@ -486,14 +486,13 @@ static int ftp_abort(URLContext *h)
} }
} else { } else {
ftp_close_data_connection(s); ftp_close_data_connection(s);
} if (ftp_status(s, NULL, abor_codes) < 225) {
/* wu-ftpd also closes control connection after data connection closing */
if (ftp_status(s, NULL, abor_codes) < 225) { ffurl_closep(&s->conn_control);
/* wu-ftpd also closes control connection after data connection closing */ if ((err = ftp_connect_control_connection(h)) < 0) {
ffurl_closep(&s->conn_control); av_log(h, AV_LOG_ERROR, "Reconnect failed.\n");
if ((err = ftp_connect_control_connection(h)) < 0) { return err;
av_log(h, AV_LOG_ERROR, "Reconnect failed.\n"); }
return err;
} }
} }