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

Brooks Davis brooks at FreeBSD.org
Wed Jan 20 19:08:51 UTC 2016


Author: brooks
Date: Wed Jan 20 19:08:49 2016
New Revision: 294453
URL: https://svnweb.freebsd.org/changeset/base/294453

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 at mccme.ru>

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

Modified: stable/10/lib/libc/string/wcsncat.c
==============================================================================
--- stable/10/lib/libc/string/wcsncat.c	Wed Jan 20 18:47:33 2016	(r294452)
+++ stable/10/lib/libc/string/wcsncat.c	Wed Jan 20 19:08:49 2016	(r294453)
@@ -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--;
 	}


More information about the svn-src-all mailing list