From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 28340 invoked by alias); 19 Jul 2011 12:27:47 -0000 Received: (qmail 28323 invoked by uid 22791); 19 Jul 2011 12:27:46 -0000 X-SWARE-Spam-Status: No, hits=-6.8 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,SPF_HELO_PASS,TW_DX,TW_RX,TW_TR,TW_XF X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 19 Jul 2011 12:27:33 +0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p6JCRWwn031597 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 19 Jul 2011 08:27:32 -0400 Received: from hase.home (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p6JCRVhT013243 for ; Tue, 19 Jul 2011 08:27:32 -0400 From: Andreas Schwab To: libc-hacker@sourceware.org Subject: [PATCH] Fix alloca accounting in strxfm X-Yow: I'm in direct contact with many advanced fun CONCEPTS. Date: Tue, 19 Jul 2011 12:27:00 -0000 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Mailing-List: contact libc-hacker-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-hacker-owner@sourceware.org X-SW-Source: 2011-07/txt/msg00005.txt.bz2 2011-07-19 Andreas Schwab * string/strxfrm_l.c (STRXFRM): Fix alloca accounting. --- string/strxfrm_l.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/string/strxfrm_l.c b/string/strxfrm_l.c index 351b426..3448f1a 100644 --- a/string/strxfrm_l.c +++ b/string/strxfrm_l.c @@ -1,4 +1,4 @@ -/* 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 +150,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]; -- 1.7.6 -- Andreas Schwab, schwab@redhat.com GPG Key fingerprint = D4E8 DBE3 3813 BB5D FA84 5EC7 45C6 250E 6F00 984E "And now for something completely different."