[FFmpeg-cvslog] avformat/ftp: Solve a crash bug when network occur a exception
tiejun.peng@foxmail.com
git at videolan.org
Thu Apr 6 01:00:59 EEST 2017
ffmpeg | branch: master | tiejun.peng at foxmail.com <tiejun.peng at foxmail.com> | Tue Apr 4 22:12:19 2017 +0800| [9fe73b0147d329bb03ea57c201dc99317cbf3c29] | committer: Michael Niedermayer
avformat/ftp: Solve a crash bug when network occur a exception
This fixes a proble where ffmpeg would cause crash to do a seek when the network disconnect.
The log like this:
01-01 10:53:03.441 6580 6580 F DEBUG : backtrace:
01-01 10:53:03.441 6580 6580 F DEBUG : #00 pc 0002942e /system/lib/libavformat.so (ffurl_write+9)
Signed-off-by: tiejun.peng <tiejun.peng at foxmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9fe73b0147d329bb03ea57c201dc99317cbf3c29
---
libavformat/ftp.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/libavformat/ftp.c b/libavformat/ftp.c
index 0663b47..9aa7a45 100644
--- a/libavformat/ftp.c
+++ b/libavformat/ftp.c
@@ -206,6 +206,9 @@ static int ftp_send_command(FTPContext *s, const char *command,
if (response)
*response = NULL;
+ if (!s->conn_control)
+ return AVERROR(EIO);
+
if ((err = ffurl_write(s->conn_control, command, strlen(command))) < 0)
return err;
if (!err)
More information about the ffmpeg-cvslog
mailing list