From owner-svn-src-head@freebsd.org  Thu Jun  1 19:21:32 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 2620DB7CEDA;
 Thu,  1 Jun 2017 19:21:32 +0000 (UTC)
 (envelope-from stevek@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 E9A812F46;
 Thu,  1 Jun 2017 19:21:31 +0000 (UTC)
 (envelope-from stevek@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v51JLUdi094343;
 Thu, 1 Jun 2017 19:21:30 GMT (envelope-from stevek@FreeBSD.org)
Received: (from stevek@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v51JLUqE094342;
 Thu, 1 Jun 2017 19:21:30 GMT (envelope-from stevek@FreeBSD.org)
Message-Id: <201706011921.v51JLUqE094342@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: stevek set sender to
 stevek@FreeBSD.org using -f
From: "Stephen J. Kiernan" <stevek@FreeBSD.org>
Date: Thu, 1 Jun 2017 19:21:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r319453 - head/contrib/telnet/telnetd
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Jun 2017 19:21:32 -0000

Author: stevek
Date: Thu Jun  1 19:21:30 2017
New Revision: 319453
URL: https://svnweb.freebsd.org/changeset/base/319453

Log:
  Fix memory leak in edithost
  
  The problem is that when the parameter 'pat' is null, the function locally
  allocates a NULL string but never frees it.
  
  Instead of tracking the local alloc, it is noted that the while(*pat) never
  enters when there is a local alloc.
  So instead of doing the local alloc, check that 'pat' is null before the
  while(*pat) loop.
  
  Found using clang's static analyzer - scan-build
  
  Submitted by:	Thomas Rix <trix@juniper.net>
  Reviewed by:	markm
  Approved by:	sjg (mentor)
  MFC after:	1 week
  Differential Revision:	https://reviews.freebsd.org/D9689

Modified:
  head/contrib/telnet/telnetd/utility.c

Modified: head/contrib/telnet/telnetd/utility.c
==============================================================================
--- head/contrib/telnet/telnetd/utility.c	Thu Jun  1 18:39:54 2017	(r319452)
+++ head/contrib/telnet/telnetd/utility.c	Thu Jun  1 19:21:30 2017	(r319453)
@@ -360,30 +360,30 @@ edithost(char *pat, char *host)
 {
 	char *res = editedhost;
 
-	if (!pat)
-		pat = strdup("");
-	while (*pat) {
-		switch (*pat) {
+	if (pat) {
+		while (*pat) {
+			switch (*pat) {
 
-		case '#':
-			if (*host)
-				host++;
-			break;
+			case '#':
+				if (*host)
+					host++;
+				break;
 
-		case '@':
-			if (*host)
-				*res++ = *host++;
-			break;
+			case '@':
+				if (*host)
+					*res++ = *host++;
+				break;
 
-		default:
-			*res++ = *pat;
-			break;
+			default:
+				*res++ = *pat;
+				break;
+			}
+			if (res == &editedhost[sizeof editedhost - 1]) {
+				*res = '\0';
+				return;
+			}
+			pat++;
 		}
-		if (res == &editedhost[sizeof editedhost - 1]) {
-			*res = '\0';
-			return;
-		}
-		pat++;
 	}
 	if (*host)
 		(void) strncpy(res, host,