From owner-svn-src-stable-9@FreeBSD.ORG  Sat Jul  6 08:58:30 2013
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id ADD33E38;
 Sat,  6 Jul 2013 08:58:30 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id A00811E5E;
 Sat,  6 Jul 2013 08:58:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r668wUvh092267;
 Sat, 6 Jul 2013 08:58:30 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r668wUhs092266;
 Sat, 6 Jul 2013 08:58:30 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201307060858.r668wUhs092266@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Sat, 6 Jul 2013 08:58:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r252875 - stable/9/sys/boot/common
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Jul 2013 08:58:30 -0000

Author: avg
Date: Sat Jul  6 08:58:30 2013
New Revision: 252875
URL: http://svnweb.freebsd.org/changeset/base/252875

Log:
  MFC r249139: strncmp for boot code: fix an off by one error

Modified:
  stable/9/sys/boot/common/util.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/boot/   (props changed)

Modified: stable/9/sys/boot/common/util.c
==============================================================================
--- stable/9/sys/boot/common/util.c	Sat Jul  6 08:51:56 2013	(r252874)
+++ stable/9/sys/boot/common/util.c	Sat Jul  6 08:58:30 2013	(r252875)
@@ -68,9 +68,9 @@ int
 strncmp(const char *s1, const char *s2, size_t len)
 {
 
-	for (; *s1 == *s2 && *s1 != '\0' && len > 0; len--, s1++, s2++)
+	for (; len > 0 && *s1 == *s2 && *s1 != '\0'; len--, s1++, s2++)
 		;
-	return ((unsigned char)*s1 - (unsigned char)*s2);
+	return (len == 0 ? 0 : (unsigned char)*s1 - (unsigned char)*s2);
 }
 
 void