Libc-997.1.1.tar.gz

[apple/libc.git] / secure / strcpy_chk.c

diff --git a/secure/strcpy_chk.c b/secure/strcpy_chk.c
index dd3df206ad8c91c7362c01c29e79625b772972ac..71872e1663188b2699ecde73f285820400239fee 100644 (file)
--- a/secure/strcpy_chk.c
+++ b/secure/strcpy_chk.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007 Apple Inc. All rights reserved.
+ * Copyright (c) 2007-2013 Apple Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  *
@@ -23,16 +23,19 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include "secure.h"
 
-extern void __chk_fail (void) __attribute__((__noreturn__));
-
-void *
+char *
 __strcpy_chk (char *restrict dest, char *restrict src, size_t dstlen)
 {
-  size_t len = strlen (src);
+  // stpcpy returns a pointer to the \0
+  size_t len = stpcpy(dest, src) - dest + 1;
 
   if (__builtin_expect (dstlen < len, 0))
-    __chk_fail ();
+    __chk_fail_overflow ();
+
+  if (__builtin_expect (__chk_assert_no_overlap, 1))
+    __chk_overlap(dest, len, src, len);
 
-  return memcpy (dest, src, len + 1);
+  return dest;
 }