From 680b74830af43c5ff4391d9f7dc8f2e1a3a939d7 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Tue, 19 Jul 2011 15:03:57 -0400 Subject: Fix alloca accounting in strxfm (cherry picked from commit e0e722848005e335132015a64a09cad7f7a12073) --- ChangeLog | 4 ++++ string/strxfrm_l.c | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d774296226..4beefb4e3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-07-19 Andreas Schwab + + * string/strxfrm_l.c (STRXFRM): Fix alloca accounting. + 2011-07-19 Ulrich Drepper * 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 351b426541..220253c4d6 100644 --- 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 , 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]; -- cgit 1.4.1