From owner-svn-src-all@freebsd.org  Wed Jun  8 01:17:23 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 5C0C5B6FB65;
 Wed,  8 Jun 2016 01:17:23 +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 2C6FB11D6;
 Wed,  8 Jun 2016 01:17:23 +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 u581HMtZ057854;
 Wed, 8 Jun 2016 01:17:22 GMT (envelope-from truckman@FreeBSD.org)
Received: (from truckman@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u581HMlX057853;
 Wed, 8 Jun 2016 01:17:22 GMT (envelope-from truckman@FreeBSD.org)
Message-Id: <201606080117.u581HMlX057853@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: Wed, 8 Jun 2016 01:17:22 +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: r301571 - stable/10/bin/sh
X-SVN-Group: stable-10
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: Wed, 08 Jun 2016 01:17:23 -0000

Author: truckman
Date: Wed Jun  8 01:17:22 2016
New Revision: 301571
URL: https://svnweb.freebsd.org/changeset/base/301571

Log:
  MFC r301139
  
  The (i < PROMPTLEN - 1) test added by r300442 in the code for the default
  case of \c in the prompt format string is a no-op.  We already passed
  this test at the top of the loop, and i has not yet been incremented in
  this path.  Change this test to (i < PROMPTLEN - 2).
  
  Reported by:	Coverity
  CID:		1008328
  Reviewed by:	cem
  Differential Revision:	https://reviews.freebsd.org/D6552

Modified:
  stable/10/bin/sh/parser.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/bin/sh/parser.c
==============================================================================
--- stable/10/bin/sh/parser.c	Wed Jun  8 00:29:48 2016	(r301570)
+++ stable/10/bin/sh/parser.c	Wed Jun  8 01:17:22 2016	(r301571)
@@ -2039,7 +2039,7 @@ getprompt(void *unused __unused)
 				 */
 			default:
 				ps[i] = '\\';
-				if (i < PROMPTLEN - 1)
+				if (i < PROMPTLEN - 2)
 					ps[++i] = *fmt;
 				break;
 			}