Commit e1fb3143 authored by Lukasz Marek's avatar Lukasz Marek

avformat/ftp: fix possible deadlock

Signed-off-by: 's avatarLukasz Marek <lukasz.m.luki@gmail.com>
parent 7b1640c4
......@@ -486,8 +486,6 @@ 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);
......@@ -496,6 +494,7 @@ static int ftp_abort(URLContext *h)
return err;
}
}
}
return 0;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment