From owner-svn-src-stable-10@freebsd.org Mon Jul 25 15:04:16 2016
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id C54E0BA39A0;
Mon, 25 Jul 2016 15:04:16 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 97AAF16DB;
Mon, 25 Jul 2016 15:04:16 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6PF4FAN058147;
Mon, 25 Jul 2016 15:04:15 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6PF4FFd058145;
Mon, 25 Jul 2016 15:04:15 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201607251504.u6PF4FFd058145@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Mon, 25 Jul 2016 15:04:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r303303 - stable/10/usr.bin/mail
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
<svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>,
<mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>,
<mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Jul 2016 15:04:16 -0000
Author: pfg
Date: Mon Jul 25 15:04:15 2016
New Revision: 303303
URL: https://svnweb.freebsd.org/changeset/base/303303
Log:
MFC r302911:
mail(1): Avoid closing negative file descriptors.
CID: 1008105, 1008106
Modified:
stable/10/usr.bin/mail/quit.c
stable/10/usr.bin/mail/v7.local.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.bin/mail/quit.c
==============================================================================
--- stable/10/usr.bin/mail/quit.c Mon Jul 25 15:03:14 2016 (r303302)
+++ stable/10/usr.bin/mail/quit.c Mon Jul 25 15:04:15 2016 (r303303)
@@ -228,7 +228,8 @@ quit(void)
return;
}
(void)Fclose(obuf);
- (void)close(open(mbox, O_CREAT | O_TRUNC | O_WRONLY, 0600));
+ if ((fd = open(mbox, O_CREAT | O_TRUNC | O_WRONLY, 0600)) >= 0)
+ (void)close(fd);
if ((obuf = Fopen(mbox, "r+")) == NULL) {
warn("%s", mbox);
(void)Fclose(ibuf);
Modified: stable/10/usr.bin/mail/v7.local.c
==============================================================================
--- stable/10/usr.bin/mail/v7.local.c Mon Jul 25 15:03:14 2016 (r303302)
+++ stable/10/usr.bin/mail/v7.local.c Mon Jul 25 15:04:15 2016 (r303303)
@@ -68,9 +68,12 @@ findmail(char *user, char *buf, int bufl
void
demail(void)
{
+ int fd;
if (value("keep") != NULL || rm(mailname) < 0)
- (void)close(open(mailname, O_CREAT | O_TRUNC | O_WRONLY, 0600));
+ if ((fd = open(mailname, O_CREAT | O_TRUNC | O_WRONLY, 0600)) >=
+ 0)
+ (void)close(fd);
}
/*