Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 1 Jun 2016 16:56:29 +0000 (UTC)
From:      Don Lewis <truckman@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r301139 - head/bin/sh
Message-ID:  <201606011656.u51GuTlZ040844@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: truckman
Date: Wed Jun  1 16:56:29 2016
New Revision: 301139
URL: https://svnweb.freebsd.org/changeset/base/301139

Log:
  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
  MFC after:	1 week

Modified:
  head/bin/sh/parser.c

Modified: head/bin/sh/parser.c
==============================================================================
--- head/bin/sh/parser.c	Wed Jun  1 16:53:02 2016	(r301138)
+++ head/bin/sh/parser.c	Wed Jun  1 16:56:29 2016	(r301139)
@@ -2063,7 +2063,7 @@ getprompt(void *unused __unused)
 				 */
 			default:
 				ps[i] = '\\';
-				if (i < PROMPTLEN - 1)
+				if (i < PROMPTLEN - 2)
 					ps[++i] = *fmt;
 				break;
 			}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606011656.u51GuTlZ040844>