[google gcc-4_7] Backport r195207 (fix for PR55982) into google/gcc-4_7

[Paul Pluzhnikov]

Ok for google/gcc-4_7 ?

Ref b/8003094

Thanks,
--
Paul Pluzhnikov


2013-01-15  Paul Pluzhnikov  <ppluzhni...@google.com>

        PR 55982
        * strncat-chk.c (__strncat_chk): Fix loop unroll.


Index: libssp/strncat-chk.c
===================================================================
--- libssp/strncat-chk.c        (revision 195212)
+++ libssp/strncat-chk.c        (working copy)
@@ -87,12 +87,6 @@ __strncat_chk (char *__restrict__ dest, const char
           *++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;
     }