Fix alloca accounting in strxfm

diff --git a/ChangeLog b/ChangeLog
index b6cc5ca..2a57fc3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-19  Andreas Schwab  <schwab@redhat.com>
+
+       * string/strxfrm_l.c (STRXFRM): Fix alloca accounting.
+
 2011-07-19  Ulrich Drepper  <drepper@gmail.com>
 
        * nscd/nscd.c (termination_handler): Don't do anything for a database

diff --git a/string/strxfrm_l.c b/string/strxfrm_l.c
index 351b426..220253c 100644 (file)
--- a/string/strxfrm_l.c
+++ b/string/strxfrm_l.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1995-1997,2002,2004-2006,2010 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1997,2002,2004-2006,2010,2011
+   Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Ulrich Drepper <drepper@gnu.org>, 1995.
 
@@ -150,7 +151,7 @@ STRXFRM (STRING_TYPE *dest, const STRING_TYPE *src, size_t n, __locale_t l)
      values.  But since there is no limit on the length of the string
      we have to use `malloc' if the string is too long.  We should be
      very conservative here.  */
-  if (! __libc_use_alloca (srclen))
+  if (! __libc_use_alloca ((srclen + 1) * (sizeof (int32_t) + 1)))
     {
       idxarr = (int32_t *) malloc ((srclen + 1) * (sizeof (int32_t) + 1));
       rulearr = (unsigned char *) &idxarr[srclen];