Loading...
--- Libc/Libc-1725.40.4/secure/strncpy_chk.c
+++ Libc/Libc-583/secure/strncpy_chk.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007-2013 Apple Inc. All rights reserved.
+ * Copyright (c) 2007 Apple Inc. All rights reserved.
*
* @APPLE_LICENSE_HEADER_START@
*
@@ -23,26 +23,15 @@
#include <stdlib.h>
#include <string.h>
-#include "secure.h"
-char *
+extern void __chk_fail (void) __attribute__((__noreturn__));
+
+void *
__strncpy_chk (char *restrict dest, char *restrict src,
size_t len, size_t dstlen)
{
- size_t n;
+ if (__builtin_expect (dstlen < len, 0))
+ __chk_fail ();
- if (__builtin_expect (dstlen < len, 0))
- __chk_fail_overflow ();
-
- // stpncpy normally returns a pointer to the \0
- n = stpncpy (dest, src, len) - dest + 1;
-
- // Check if it's pointing to the location after the buffer after not writing \0
- if (n == len + 1)
- n--;
-
- if (__builtin_expect (__chk_assert_no_overlap != 0, 1))
- __chk_overlap(dest, n, src, n);
-
- return dest;
+ return strncpy (dest, src, len);
}