From patchwork Mon Mar 20 16:16:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "tiejun.peng" X-Patchwork-Id: 3029 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.50.79 with SMTP id y76csp1459030vsy; Mon, 20 Mar 2017 09:18:23 -0700 (PDT) X-Received: by 10.28.68.69 with SMTP id r66mr10584139wma.115.1490026703674; Mon, 20 Mar 2017 09:18:23 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v25si23654566wra.330.2017.03.20.09.18.23; Mon, 20 Mar 2017 09:18:23 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D22246883A7; Mon, 20 Mar 2017 18:18:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbg338.qq.com (smtpbg338.qq.com [14.17.44.33]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 47D97688312 for ; Mon, 20 Mar 2017 18:17:54 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1490026656; bh=H6VRlhvf9a7y3HSPYtcaGNM56z4+q3WHbnDxoXxxXx4=; h=From:To:Cc:Subject:Date:Message-Id; b=hW8SePZCHlR3MIFriq/mN/wnkrD5Bn0l4MEjP3rIDdz0SPXkvGWoUkT9OnNAThSSi n3lALWvZdqNOEev2AhdAsk+Z0tknEh15Tqoyka6HkmvGh+bLqRDv7SBMeAR5FDQ7KL eFNtcU46NIkCWoLl8GU3rNE7+A/TYqBTIvA60A/w= X-QQ-mid: esmtp32t1490026654twdxqgmxc Received: from localhost.localdomain (unknown [223.73.1.127]) by esmtp4.qq.com (ESMTP) with id ; Tue, 21 Mar 2017 00:17:13 +0800 (CST) X-QQ-SSF: C10000000000001024120F00000000T X-QQ-FEAT: 3jlOKZxptE4h8B1Om6wArNdLnr1dAViec0WPMtKeyjlTjDCeyhL3e7VRFhUjH v1ZhuZ2lbOAkZQBMeO7P+OvIvdtTSpTJL+6r+jZ5AJh3vf5vAUmOj5znHxDeOUeMOX0zluk 8b2f4MXA1nctma9hp60fwsHQXtKawaTmiYXn/qEScZ5JweEGLPCuZVGhBw9LtiprjItiFt+ jOy+Q2D+39M/rptH5/3FxwHP6FWffDcYiz6oqa1JMf9aN0tppuJO7A1fNtGj7ZsLi6DWuKm OsQw== X-QQ-GoodBg: 0 From: "tiejun.peng" To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Mar 2017 00:16:49 +0800 Message-Id: <1490026609-15574-1-git-send-email-tiejun.peng@foxmail.com> X-Mailer: git-send-email 2.7.4 X-QQ-SENDSIZE: 520 Feedback-ID: esmtp:foxmail.com:bgforeign:bgforeign3 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH v2] avformat/ftp: Solve a crash bug when network occur a exception X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: "tiejun.peng" MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" 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 --- 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)