Merge changes between r22241 and r22552 from /fsf/trunk.

git-svn-id: svn://svn.eglibc.org/trunk@22553 7b3dc134-2b1b-0410-93df-9e9f96275f8d

1 files changed, 2 insertions, 8 deletions

diff --git a/libc/string/strcpy.c b/libc/string/strcpy.c
index a2bb8efcb..b71f7536b 100644
--- a/libc/string/strcpy.c
+++ b/libc/string/strcpy.c
@@ -18,7 +18,6 @@
 #include <stddef.h>
 #include <string.h>
 #include <memcopy.h>
-#include <bp-checks.h>
 
 #undef strcpy
 
@@ -29,9 +28,8 @@ strcpy (dest, src)
      const char *src;
 {
   char c;
-  char *__unbounded s = (char *__unbounded) CHECK_BOUNDS_LOW (src);
-  const ptrdiff_t off = CHECK_BOUNDS_LOW (dest) - s - 1;
-  size_t n;
+  char *s = (char *) src;
+  const ptrdiff_t off = dest - s - 1;
 
   do
     {
@@ -40,10 +38,6 @@ strcpy (dest, src)
     }
   while (c != '\0');
 
-  n = s - src;
-  (void) CHECK_BOUNDS_HIGH (src + n);
-  (void) CHECK_BOUNDS_HIGH (dest + n);
-
   return dest;
 }
 libc_hidden_builtin_def (strcpy)