From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 25063 invoked by alias); 29 Jun 2011 21:49:29 -0000 Received: (qmail 25055 invoked by uid 22791); 29 Jun 2011 21:49:28 -0000 X-SWARE-Spam-Status: No, hits=-6.4 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,SPF_HELO_PASS,T_RP_MATCHES_RCVD 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; Wed, 29 Jun 2011 21:49:09 +0000 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p5TLmlbW002920 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 29 Jun 2011 17:48:47 -0400 Received: from host1.jankratochvil.net ([10.3.113.13]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p5TLmi6U002462 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 29 Jun 2011 17:48:46 -0400 Received: from host1.jankratochvil.net (localhost [127.0.0.1]) by host1.jankratochvil.net (8.14.4/8.14.4) with ESMTP id p5TLmheW009373; Wed, 29 Jun 2011 23:48:43 +0200 Received: (from jkratoch@localhost) by host1.jankratochvil.net (8.14.4/8.14.4/Submit) id p5TLmg8t009363; Wed, 29 Jun 2011 23:48:42 +0200 Date: Wed, 29 Jun 2011 21:49:00 -0000 From: Jan Kratochvil To: Joel Brobecker Cc: Sterling Augustine , gdb-patches@sourceware.org Subject: Re: [readline patch, gdb-7.3?] Avoid free from a signal handler [Re: [PATCH] Make interrupting tab-completion safe.] Message-ID: <20110629214841.GA18179@host1.jankratochvil.net> References: <20110612121158.GA10611@host1.jankratochvil.net> <20110626222146.GA4410@host1.jankratochvil.net> <20110627160307.GG20676@adacore.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20110627160307.GG20676@adacore.com> 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: 2011-06/txt/msg00475.txt.bz2 On Mon, 27 Jun 2011 18:03:07 +0200, Joel Brobecker wrote: > > readline/ > > 2011-06-27 Jan Kratochvil > > > > Avoid free from a signal handler. > > * Makefile.in (xfree.o): Add readline.h. > > * xfree.c: Include stdio.h and readline.h. > > (xfree): Return on RL_STATE_SIGHANDLER. > > * xmalloc.h (xfree): New definition. > > Interesting. OK for gdb-7.3 if OK for readline... Checked in the original patch for trunk: http://sourceware.org/ml/gdb-cvs/2011-06/msg00168.html For gdb-7.3 it is more complicated as it still has readline-5.1, checked in there the patch below, it is not nice but I find it OK for the branch. Thanks, Jan gdb_7_3-branch: http://sourceware.org/ml/gdb-cvs/2011-06/msg00169.html --- src/readline/ChangeLog.gdb 2011/03/04 18:12:47 1.38 +++ src/readline/ChangeLog.gdb 2011/06/29 21:46:43 1.38.2.1 @@ -1,3 +1,12 @@ +2011-06-27 Jan Kratochvil + + Avoid free from a signal handler. + * Makefile.in (xmalloc.o): Add readline.h. + * xmalloc.c: Include readline.h. + (xmalloc, xrealloc): Disable them by #if 0. + (xfree): Return on RL_STATE_SIGHANDLER, #undef free. + * xmalloc.h (xfree, free): New definition. + 2011-03-04 Michael Snyder * bind.c (rl_function_dumper): Free allocated memory. --- src/readline/Makefile.in 2009/07/30 22:53:17 1.11 +++ src/readline/Makefile.in 2011/06/29 21:46:43 1.11.8.1 @@ -417,7 +417,7 @@ vi_mode.o: readline.h keymaps.h rltypedefs.h chardefs.h tilde.h vi_mode.o: history.h ansi_stdlib.h rlstdc.h xmalloc.o: ${BUILD_DIR}/config.h -xmalloc.o: ansi_stdlib.h +xmalloc.o: ansi_stdlib.h readline.h bind.o: rlshell.h histfile.o: rlshell.h --- src/readline/xmalloc.c 2006/04/20 20:13:20 1.5 +++ src/readline/xmalloc.c 2011/06/29 21:46:43 1.5.40.1 @@ -33,6 +33,7 @@ #endif /* HAVE_STDLIB_H */ #include "xmalloc.h" +#include "readline.h" /* **************************************************************** */ /* */ @@ -40,6 +41,9 @@ /* */ /* **************************************************************** */ +/* xmalloc and xrealloc are provided by GDB. */ +#if 0 + static void memory_error_and_abort (fname) char *fname; @@ -77,12 +81,20 @@ return (temp); } +/* xmalloc and xrealloc are provided by GDB. */ +#endif /* 0 */ + /* Use this as the function to call when adding unwind protects so we don't need to know what free() returns. */ void xfree (string) PTR_T string; { + /* Leak a bit. */ + if (RL_ISSTATE(RL_STATE_SIGHANDLER)) + return; + +#undef free if (string) free (string); } --- src/readline/xmalloc.h 2006/04/20 20:13:20 1.4 +++ src/readline/xmalloc.h 2011/06/29 21:46:43 1.4.40.1 @@ -39,6 +39,12 @@ #endif /* !PTR_T */ +/* xmalloc and xrealloc should be also protected from RL_STATE_SIGHANDLER. */ +#define xfree xfree_readline + +/* readline-5.1 backport. */ +#define free xfree + extern PTR_T xmalloc PARAMS((size_t)); extern PTR_T xrealloc PARAMS((void *, size_t)); extern void xfree PARAMS((void *));