From owner-svn-src-stable-8@freebsd.org Fri Jan 22 00:08:17 2016
Return-Path: <owner-svn-src-stable-8@freebsd.org>
Delivered-To: svn-src-stable-8@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 75CEEA8C112;
Fri, 22 Jan 2016 00:08:17 +0000 (UTC)
(envelope-from brooks@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 444D317EB;
Fri, 22 Jan 2016 00:08:17 +0000 (UTC)
(envelope-from brooks@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0M08GVm037260;
Fri, 22 Jan 2016 00:08:16 GMT (envelope-from brooks@FreeBSD.org)
Received: (from brooks@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0M08Grs037259;
Fri, 22 Jan 2016 00:08:16 GMT (envelope-from brooks@FreeBSD.org)
Message-Id: <201601220008.u0M08Grs037259@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: brooks set sender to
brooks@FreeBSD.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Date: Fri, 22 Jan 2016 00:08:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r294537 - stable/8/lib/libc/string
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-8>,
<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8/>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>,
<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 22 Jan 2016 00:08:17 -0000
Author: brooks
Date: Fri Jan 22 00:08:16 2016
New Revision: 294537
URL: https://svnweb.freebsd.org/changeset/base/294537
Log:
MFC r293855:
Avoid reading pass the end of the source buffer when it is not NUL
terminated.
If this buffer is adjacent to an unmapped page or a version of C with
bounds checked is used this may result in a crash.
PR: 206177
Submitted by: Alexander Cherepanov <cherepan@mccme.ru>
Requested by: danfe
Modified:
stable/8/lib/libc/string/wcsncat.c
Directory Properties:
stable/8/lib/libc/ (props changed)
Modified: stable/8/lib/libc/string/wcsncat.c
==============================================================================
--- stable/8/lib/libc/string/wcsncat.c Thu Jan 21 22:53:12 2016 (r294536)
+++ stable/8/lib/libc/string/wcsncat.c Fri Jan 22 00:08:16 2016 (r294537)
@@ -48,7 +48,7 @@ wcsncat(wchar_t * __restrict s1, const w
p++;
q = p;
r = s2;
- while (*r && n) {
+ while (n && *r) {
*q++ = *r++;
n--;
}