Skip to content

F
ffmpeg.wasm-core
Commit e1fb3143 authored by Lukasz Marek's avatar Lukasz Marek
Browse files
Options

avformat/ftp: fix possible deadlock 

Signed-off-by: 's avatarLukasz Marek <lukasz.m.luki@gmail.com>
parent 7b1640c4
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 8 deletions
libavformat/ftp.c
View file @ e1fb3143
...@@ -486,8 +486,6 @@ static int ftp_abort(URLContext *h) ...@@ -486,8 +486,6 @@ 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) { if (ftp_status(s, NULL, abor_codes) < 225) {
/* wu-ftpd also closes control connection after data connection closing */ /* wu-ftpd also closes control connection after data connection closing */
ffurl_closep(&s->conn_control); ffurl_closep(&s->conn_control);
...@@ -496,6 +494,7 @@ static int ftp_abort(URLContext *h) ...@@ -496,6 +494,7 @@ static int ftp_abort(URLContext *h)
return err; return err;
} }
} }
}
return 0; 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