From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 8798 invoked by alias); 14 Sep 2012 12:55:41 -0000 Received: (qmail 8787 invoked by uid 22791); 14 Sep 2012 12:55:40 -0000 X-SWARE-Spam-Status: No, hits=-6.5 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,RCVD_IN_DNSWL_HI,RCVD_IN_HOSTKARMA_W,RP_MATCHES_RCVD,SPF_HELO_PASS,TW_CP 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; Fri, 14 Sep 2012 12:55:27 +0000 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q8ECtR6b015055 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 14 Sep 2012 08:55:27 -0400 Received: from host2.jankratochvil.net (ovpn-113-58.phx2.redhat.com [10.3.113.58]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q8ECtM02000439 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Fri, 14 Sep 2012 08:55:25 -0400 Date: Fri, 14 Sep 2012 12:55:00 -0000 From: Jan Kratochvil To: Siddhesh Poyarekar Cc: gdb-patches@sourceware.org Subject: Re: [PATCH] Replace potentially unsafe alloca with xmalloc/xfree in value_concat Message-ID: <20120914125521.GA26499@host2.jankratochvil.net> References: <20120914144629.67e493d0@spoyarek> <20120914113705.GA20303@host2.jankratochvil.net> <20120914181833.7b50d60a@spoyarek> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20120914181833.7b50d60a@spoyarek> User-Agent: Mutt/1.5.21 (2010-09-15) X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2012-09/txt/msg00282.txt.bz2 On Fri, 14 Sep 2012 14:48:33 +0200, Siddhesh Poyarekar wrote: > http://sourceware.org/ml/gdb-cvs/2012-09/msg00068.html > > CVSROOT: /cvs/src > Module name: src > Changes by: siddhesh@sourceware.org 2012-09-14 12:46:56 > > Modified files: > gdb : ChangeLog valarith.c > > Log message: > * valarith.c (value_concat): Replace unsafe ALLOCA with > XMALLOC/XFREE. > > Patches: > http://sourceware.org/cgi-bin/cvsweb.cgi/src/gdb/ChangeLog.diff?cvsroot=src&r1=1.14659&r2=1.14660 > http://sourceware.org/cgi-bin/cvsweb.cgi/src/gdb/valarith.c.diff?cvsroot=src&r1=1.105&r2=1.106 I understand it is not significant but: In this case you could post just the first link as this patch itself has been (in fact - one line change) already posted here before. If you meant this as the patch post this is still not easily + offline reviewable. For a full commit post either post 'cvs diff' before you commit it or wait half an hour for mirror into GIT and take it from GIT or use the script of mine: http://git.jankratochvil.net/?p=nethome.git;a=blob_plain;f=bin/changelogget;hb=master -> changelogget -n http://sourceware.org/ml/gdb-cvs/2012-09/msg00068.html I do not know how other people do that, there are many various possibilities. Thanks, Jan http://sourceware.org/ml/gdb-cvs/2012-09/msg00068.html --- src/gdb/ChangeLog 2012/09/14 12:10:21 1.14659 +++ src/gdb/ChangeLog 2012/09/14 12:46:55 1.14660 @@ -1,3 +1,8 @@ +2012-09-14 Siddhesh Poyarekar + + * valarith.c (value_concat): Replace unsafe ALLOCA with + XMALLOC/XFREE. + 2012-09-14 Pedro Alves * gdb.1 (SEE ALSO): Expand pointer to GDB's Texinfo manual. --- src/gdb/valarith.c 2012/08/16 07:36:20 1.105 +++ src/gdb/valarith.c 2012/09/14 12:46:55 1.106 @@ -668,9 +668,12 @@ if (TYPE_CODE (type2) == TYPE_CODE_STRING || TYPE_CODE (type2) == TYPE_CODE_CHAR) { + struct cleanup *back_to; + count = longest_to_int (value_as_long (inval1)); inval2len = TYPE_LENGTH (type2); - ptr = (char *) alloca (count * inval2len); + ptr = (char *) xmalloc (count * inval2len); + back_to = make_cleanup (xfree, ptr); if (TYPE_CODE (type2) == TYPE_CODE_CHAR) { char_type = type2; @@ -693,6 +696,7 @@ } } outval = value_string (ptr, count * inval2len, char_type); + do_cleanups (back_to); } else if (TYPE_CODE (type2) == TYPE_CODE_BOOL) { @@ -706,6 +710,8 @@ else if (TYPE_CODE (type1) == TYPE_CODE_STRING || TYPE_CODE (type1) == TYPE_CODE_CHAR) { + struct cleanup *back_to; + /* We have two character strings to concatenate. */ if (TYPE_CODE (type2) != TYPE_CODE_STRING && TYPE_CODE (type2) != TYPE_CODE_CHAR) @@ -714,7 +720,8 @@ } inval1len = TYPE_LENGTH (type1); inval2len = TYPE_LENGTH (type2); - ptr = (char *) alloca (inval1len + inval2len); + ptr = (char *) xmalloc (inval1len + inval2len); + back_to = make_cleanup (xfree, ptr); if (TYPE_CODE (type1) == TYPE_CODE_CHAR) { char_type = type1; @@ -737,6 +744,7 @@ memcpy (ptr + inval1len, value_contents (inval2), inval2len); } outval = value_string (ptr, inval1len + inval2len, char_type); + do_cleanups (back_to); } else if (TYPE_CODE (type1) == TYPE_CODE_BOOL) {