From patchwork Sun Mar 19 06:41:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "tiejun.peng" X-Patchwork-Id: 3019 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.50.79 with SMTP id y76csp1142616vsy; Sun, 19 Mar 2017 14:33:32 -0700 (PDT) X-Received: by 10.28.50.6 with SMTP id y6mr7399051wmy.112.1489959212748; Sun, 19 Mar 2017 14:33:32 -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 g10si12332766wmf.29.2017.03.19.14.33.32; Sun, 19 Mar 2017 14:33:32 -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 515966883A4; Sun, 19 Mar 2017 23:33:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbg64.qq.com (smtpbg62.qq.com [103.7.29.139]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EFF5A680D2F for ; Sun, 19 Mar 2017 08:42:46 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1489905780; bh=7fGmK6PajB51ivOFTY1QhcX04uNaDic1vh7YT3VFitY=; h=From:To:Cc:Subject:Date:Message-Id; b=Qkur6U5BgeT4Z10Y0pmNslyqESu4AjwBo+euyPRvSvyWs6ATOThOcODjweBvDu8pP I+PNh/KjQ1FKLjcsI1Thw1Vxn0M9/CMV5Z6xdvD8/gpNk9UxfCv8aUbht0N1niBJLS qyiGxRu/TxkKvboooto4WMLeulCUPDbRhJsJ5IM4= X-QQ-mid: esmtp12t1489905778tkus9vqi2 Received: from localhost.localdomain (unknown [223.73.1.41]) by esmtp4.qq.com (ESMTP) with id ; Sun, 19 Mar 2017 14:42:23 +0800 (CST) X-QQ-SSF: C10000000000000003120F00000000T X-QQ-FEAT: cbPjiZhc9zlic3Zie6eLRN9HYqE4HvNI9fVWhde6G//7vhEELVSkfmdOHcA6F VvWhi2FgIuS22OjZX+W2Atf8LWGjdpJQzbi1yUVfAMddG3gF4VTp1OvBGHjWZHgVXzEh/Px jvOuAxkDr+NcZbMokhaugU/jyhdGhPgD8yJ4yJjyvdMEpkqYcIPmXzRK23Tf0JmOQASCksw dEig3IInMI/pdFu6HGVslp0X2j+bHr3vpcvjKXcWrDps66gHF8Tbqo+V6ucqsUGY4+2fTnW M/iA== X-QQ-GoodBg: 0 From: "tiejun.peng" To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 Mar 2017 14:41:59 +0800 Message-Id: <1489905719-8132-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:bgweb:bgweb115 X-Mailman-Approved-At: Sun, 19 Mar 2017 23:33:10 +0200 Subject: [FFmpeg-devel] [PATCH] 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..3f1bf2e 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 -1; + if ((err = ffurl_write(s->conn_control, command, strlen(command))) < 0) return err; if (!err)