about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDaniel Marjamäki <Daniel.Marjamaki@evidente.se>2015-05-05 17:24:38 +0200
committerFlorian Weimer <fweimer@redhat.com>2015-05-05 17:24:38 +0200
commita6ab6ccda3c3aeb741bff7a18fb737e5b7233a49 (patch)
tree6e4a8173ff837be42a574f2a2f38193b96f32bc2
parentd0ccd0d977df62f0fe0f6c91237613b95f5d5a5f (diff)
downloadglibc-a6ab6ccda3c3aeb741bff7a18fb737e5b7233a49.tar.gz
glibc-a6ab6ccda3c3aeb741bff7a18fb737e5b7233a49.tar.xz
glibc-a6ab6ccda3c3aeb741bff7a18fb737e5b7233a49.zip
Add __nonnull attribute to wcscpy and wcsncpy [BZ#18265]
-rw-r--r--ChangeLog6
-rw-r--r--wcsmbs/wchar.h6
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 50a8d09d65..ecc175e5ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-04-30  Daniel Marjamäki  <daniel.marjamaki@evidente.se>
+
+	[BZ #18265]
+	* wcsmbs/wchar.h (wcscpy): Add __nonnull attribute.
+	(wcsncpy): Likewise.
+
 2015-05-05  Florian Weimer  <fweimer@redhat.com>
 
 	* sysdeps/unix/sysv/linux/posix_fallocate.c (posix_fallocate):
diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h
index 9652f65f3b..0d68cdaf17 100644
--- a/wcsmbs/wchar.h
+++ b/wcsmbs/wchar.h
@@ -145,11 +145,13 @@ __USING_NAMESPACE_STD(tm)
 __BEGIN_NAMESPACE_STD
 /* Copy SRC to DEST.  */
 extern wchar_t *wcscpy (wchar_t *__restrict __dest,
-			const wchar_t *__restrict __src) __THROW;
+			const wchar_t *__restrict __src)
+     __THROW __nonnull ((1, 2));
+
 /* Copy no more than N wide-characters of SRC to DEST.  */
 extern wchar_t *wcsncpy (wchar_t *__restrict __dest,
 			 const wchar_t *__restrict __src, size_t __n)
-     __THROW;
+     __THROW __nonnull ((1, 2));
 
 /* Append SRC onto DEST.  */
 extern wchar_t *wcscat (wchar_t *__restrict __dest,