commit 6aed6077fbe2b2039ab9160fb1e33ffe07907f32
author Nick Kralevich <nnk@google.com> Fri Sep 27 22:13:19 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 27 22:13:19 2013 +0000
tree 009f871a52478fef08570ac9365b5be3af08c397
parent 8427b7450fe068db6484d161f7004661c4698858
parent d13c2b1ba6681fdbee73a044d988c3f9e1172d30

Merge "Fix unnecessary call to __strncpy_chk2"

libc/include/string.h

diff --git a/libc/include/string.h b/libc/include/string.h
index 10ff722..37d22c4 100644
--- a/libc/include/string.h
+++ b/libc/include/string.h
@@ -135,6 +135,10 @@
         return __builtin___strncpy_chk(dest, src, n, bos_dest);
     }
 
+    if (__builtin_constant_p(n) && (n <= bos_src)) {
+        return __builtin___strncpy_chk(dest, src, n, bos_dest);
+    }
+
     size_t slen = __builtin_strlen(src);
     if (__builtin_constant_p(slen)) {
         return __builtin___strncpy_chk(dest, src, n, bos_dest);