From owner-svn-src-all@freebsd.org  Fri May 13 06:15:06 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 9EB14B386BB;
 Fri, 13 May 2016 06:15:06 +0000 (UTC)
 (envelope-from truckman@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 62DD6150B;
 Fri, 13 May 2016 06:15:06 +0000 (UTC)
 (envelope-from truckman@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4D6F5v7021576;
 Fri, 13 May 2016 06:15:05 GMT (envelope-from truckman@FreeBSD.org)
Received: (from truckman@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4D6F5Im021575;
 Fri, 13 May 2016 06:15:05 GMT (envelope-from truckman@FreeBSD.org)
Message-Id: <201605130615.u4D6F5Im021575@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: truckman set sender to
 truckman@FreeBSD.org using -f
From: Don Lewis <truckman@FreeBSD.org>
Date: Fri, 13 May 2016 06:15:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r299591 - head/usr.bin/mail
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 May 2016 06:15:06 -0000

Author: truckman
Date: Fri May 13 06:15:05 2016
New Revision: 299591
URL: https://svnweb.freebsd.org/changeset/base/299591

Log:
  Always return either a dynamically allocated string or NULL from
  expand().  Never return the name parameter, which could be a the buf[]
  buffer which is allocated on the stack by getdeadletter() and which
  would then be used after getdeadletter() has returned.
  
  Reported by:	Coverity
  CID:		1199383
  MFC after:	1 week

Modified:
  head/usr.bin/mail/fio.c

Modified: head/usr.bin/mail/fio.c
==============================================================================
--- head/usr.bin/mail/fio.c	Fri May 13 05:57:21 2016	(r299590)
+++ head/usr.bin/mail/fio.c	Fri May 13 06:15:05 2016	(r299591)
@@ -367,10 +367,10 @@ expand(char *name)
 		name = savestr(xname);
 	}
 	if (!strpbrk(name, "~{[*?$`'\"\\"))
-		return (name);
+		return (savestr(name));
 	if (pipe(pivec) < 0) {
 		warn("pipe");
-		return (name);
+		return (NULL);
 	}
 	(void)snprintf(cmdbuf, sizeof(cmdbuf), "echo %s", name);
 	if ((sh = value("SHELL")) == NULL)