Libc-1244.30.3.tar.gz

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

diff --git a/secure/stpcpy_chk.c b/secure/stpcpy_chk.c
index d33c7af348703d7b5d1a7a3ac89ea1b3cda8968e..c4527216765a8ac4c0a9bed9915b8ec50e081cfa 100644 (file)
--- a/secure/stpcpy_chk.c
+++ b/secure/stpcpy_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 *
 __stpcpy_chk (char *dest, const char *src, size_t dstlen)
 {
-  size_t len = strlen (src);
+  char *retval = stpcpy(dest, src); // Returns a pointer to the \0
+  size_t len = retval - dest + 1;
 
   if (__builtin_expect (dstlen < len, 0))
-    __chk_fail ();
+    __chk_fail_overflow ();
+
+  if (__builtin_expect (__chk_assert_no_overlap != 0, 1))
+    __chk_overlap(dest, len, src, len);
 
-  return memcpy (dest, src, len + 1) + len;
+  return retval;
 }