Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
e1fb3143
Commit
e1fb3143
authored
Oct 12, 2013
by
Lukasz Marek
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat/ftp: fix possible deadlock
Signed-off-by:
Lukasz Marek
<
lukasz.m.luki@gmail.com
>
parent
7b1640c4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
8 deletions
+7
-8
ftp.c
libavformat/ftp.c
+7
-8
No files found.
libavformat/ftp.c
View file @
e1fb3143
...
@@ -486,14 +486,13 @@ static int ftp_abort(URLContext *h)
...
@@ -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
;
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment