aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Pluzhnikov <ppluzhnikov@google.com>2013-01-15 18:53:49 +0000
committerPaul Pluzhnikov <ppluzhnikov@google.com>2013-01-15 18:53:49 +0000
commit625951277eb7eb8d6b0e22e2b3b711af9c8dcef6 (patch)
tree85872df15dad0ca6b120a4ec811a1027277234fe
parenta9cc0f016042f7e891b56115e9e9ee8e466f28eb (diff)
Backport r195207 (fix for PR55982) into google/gcc-4_7
Google ref b/8003094 2013-01-15 Paul Pluzhnikov <ppluzhnikov@google.com> PR 55982 * strncat-chk.c (__strncat_chk): Fix loop unroll. git-svn-id: https://gcc.gnu.org/svn/gcc/branches/google/gcc-4_7@195214 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--libssp/strncat-chk.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/libssp/strncat-chk.c b/libssp/strncat-chk.c
index d8056e84336..6ab41ffbc68 100644
--- a/libssp/strncat-chk.c
+++ b/libssp/strncat-chk.c
@@ -87,12 +87,6 @@ __strncat_chk (char *__restrict__ dest, const char *__restrict__ src,
*++dest = c;
if (c == '\0')
return s;
- if (slen-- == 0)
- __chk_fail ();
- c = *src++;
- *++dest = c;
- if (c == '\0')
- return s;
} while (--n4 > 0);
n &= 3;
}