From b164615d7992868eed1ff874b2ac0e2d1a73bffb Mon Sep 17 00:00:00 2001 From: Paul Pluzhnikov Date: Tue, 15 Jan 2013 08:02:42 -0800 Subject: re PR other/55982 (__strncat_chk is buggy) 2013-01-15 Paul Pluzhnikov PR 55982 * strncat-chk.c (__strncat_chk): Fix loop unroll. From-SVN: r195207 --- libssp/ChangeLog | 11 ++++++++--- libssp/strncat-chk.c | 6 ------ 2 files changed, 8 insertions(+), 9 deletions(-) (limited to 'libssp') diff --git a/libssp/ChangeLog b/libssp/ChangeLog index 64874e1c003..294dfd5d26b 100644 --- a/libssp/ChangeLog +++ b/libssp/ChangeLog @@ -1,12 +1,17 @@ +2013-01-15 Paul Pluzhnikov + + PR 55982 + * strncat-chk.c (__strncat_chk): Fix loop unroll. + 2012-09-14 David Edelsohn * configure: Regenerated. 2012-05-29 Benjamin Kosnik - PR libstdc++/51007 - * configure.ac: Allow gnu, gnu* variants for --enable-symvers argument. - * configure: Regenerated. + PR libstdc++/51007 + * configure.ac: Allow gnu, gnu* variants for --enable-symvers argument. + * configure: Regenerated. 2012-05-16 H.J. Lu 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; } -- cgit v1.2.3