svn commit: r294455 - stable/10/lib/libc/string

[Brooks Davis]

Author: brooks
Date: Wed Jan 20 19:26:04 2016
New Revision: 294455
URL: https://svnweb.freebsd.org/changeset/base/294455

Log:
  MFC r293856:
  
  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:		206178
  Submitted by:	Alexander Cherepanov <cherepan at mccme.ru>

Modified:
  stable/10/lib/libc/string/wcslcat.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libc/string/wcslcat.c
==============================================================================
--- stable/10/lib/libc/string/wcslcat.c	Wed Jan 20 19:20:28 2016	(r294454)
+++ stable/10/lib/libc/string/wcslcat.c	Wed Jan 20 19:26:04 2016	(r294455)
@@ -54,7 +54,7 @@ wcslcat(wchar_t *dst, const wchar_t *src
 	size_t dlen;
 
 	/* Find the end of dst and adjust bytes left but don't go past end */
-	while (*d != '\0' && n-- != 0)
+	while (n-- != 0 && *d != '\0')
 		d++;
 	dlen = d - dst;
 	n = siz - dlen;