From owner-svn-ports-all@FreeBSD.ORG Mon Apr 22 07:28:12 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 66A2A5C4; Mon, 22 Apr 2013 07:28:12 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 57BFC152E; Mon, 22 Apr 2013 07:28:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3M7SCpd044646; Mon, 22 Apr 2013 07:28:12 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3M7SCnf044645; Mon, 22 Apr 2013 07:28:12 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201304220728.r3M7SCnf044645@svn.freebsd.org> From: Alexey Dokuchaev Date: Mon, 22 Apr 2013 07:28:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r316222 - head/comms/zmtx-zmrx/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Apr 2013 07:28:12 -0000 Author: danfe Date: Mon Apr 22 07:28:11 2013 New Revision: 316222 URL: http://svnweb.freebsd.org/changeset/ports/316222 Log: Fix double fclose() when local file exists in receive_file(). Submitted by: Andy Xie (andy.xie.sz@gmail.com) Approved by: delphij (maintainer, implicit) Feature safe: yes Modified: head/comms/zmtx-zmrx/files/patch-zmrx.c Modified: head/comms/zmtx-zmrx/files/patch-zmrx.c ============================================================================== --- head/comms/zmtx-zmrx/files/patch-zmrx.c Sun Apr 21 23:02:58 2013 (r316221) +++ head/comms/zmtx-zmrx/files/patch-zmrx.c Mon Apr 22 07:28:11 2013 (r316222) @@ -26,7 +26,15 @@ } sscanf(rx_data_subpacket + strlen(rx_data_subpacket) + 1, -@@ -342,7 +343,7 @@ +@@ -243,6 +244,7 @@ + fstat(fileno(fp),&s); + + fclose(fp); ++ fp = NULL; + } + else { + exists = FALSE; +@@ -342,7 +344,7 @@ */ if (opt_v) { @@ -35,7 +43,7 @@ } } -@@ -386,8 +387,6 @@ +@@ -386,8 +388,6 @@ printf(" -q quiet\n"); printf(" (only one of -n -c or -p may be specified)\n");