From e1fb3143bb3a6006612fe0e1d1a15c8eb4955802 Mon Sep 17 00:00:00 2001 From: Lukasz Marek Date: Sat, 12 Oct 2013 12:53:54 +0200 Subject: avformat/ftp: fix possible deadlock Signed-off-by: Lukasz Marek --- libavformat/ftp.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/libavformat/ftp.c b/libavformat/ftp.c index eb3827fa35..aaa94105e5 100644 --- a/libavformat/ftp.c +++ b/libavformat/ftp.c @@ -486,14 +486,13 @@ static int ftp_abort(URLContext *h) } } else { ftp_close_data_connection(s); - } - - if (ftp_status(s, NULL, abor_codes) < 225) { - /* wu-ftpd also closes control connection after data connection closing */ - ffurl_closep(&s->conn_control); - if ((err = ftp_connect_control_connection(h)) < 0) { - av_log(h, AV_LOG_ERROR, "Reconnect failed.\n"); - return err; + if (ftp_status(s, NULL, abor_codes) < 225) { + /* wu-ftpd also closes control connection after data connection closing */ + ffurl_closep(&s->conn_control); + if ((err = ftp_connect_control_connection(h)) < 0) { + av_log(h, AV_LOG_ERROR, "Reconnect failed.\n"); + return err; + } } } -- cgit v1.2.3