From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29389 invoked by alias); 22 May 2012 09:17:38 -0000 Received: (qmail 29378 invoked by uid 22791); 22 May 2012 09:17:36 -0000 X-SWARE-Spam-Status: No, hits=2.9 required=5.0 tests=AWL,BAYES_00,KHOP_DNSBL_BUMP,MSGID_MULTIPLE_AT,RCVD_IN_HOSTKARMA_BL,RCVD_IN_JMF_BL,TW_CP X-Spam-Check-By: sourceware.org Received: from mailhost.u-strasbg.fr (HELO mailhost.u-strasbg.fr) (130.79.200.156) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 22 May 2012 09:17:24 +0000 Received: from md16.u-strasbg.fr (md16.u-strasbg.fr [130.79.200.206]) by mailhost.u-strasbg.fr (8.14.3/jtpda-5.5pre1) with ESMTP id q4M9HLA1072184 for ; Tue, 22 May 2012 11:17:22 +0200 (CEST) (envelope-from pierre.muller@ics-cnrs.unistra.fr) Received: from mailserver.u-strasbg.fr (ms18.u-strasbg.fr [130.79.204.118]) by md16.u-strasbg.fr (8.14.3/jtpda-5.5pre1) with ESMTP id q4M9HLjX025437 for ; Tue, 22 May 2012 11:17:21 +0200 (envelope-from pierre.muller@ics-cnrs.unistra.fr) Received: from E6510Muller (gw-ics.u-strasbg.fr [130.79.210.225]) (user=mullerp mech=LOGIN) by mailserver.u-strasbg.fr (8.14.3/jtpda-5.5pre1) with ESMTP id q4M9HLGP010728 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO) for ; Tue, 22 May 2012 11:17:21 +0200 (envelope-from pierre.muller@ics-cnrs.unistra.fr) From: "Pierre Muller" To: Subject: [RFA/ARI fix] Remove use of abort function in common/buffer.c Date: Tue, 22 May 2012 09:17:00 -0000 Message-ID: <001201cd37fb$b06a7c20$113f7460$@muller@ics-cnrs.unistra.fr> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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-05/txt/msg00809.txt.bz2 ARI clearly states that abort function should never be used, and to use internal_error instead. I first suspected that this was related to missing declarations in common directory, but internal_error does exist there also. Finally, looking at common/buffer.c source, I found that gdb_assert was probably a better fit here (the macro does call internal_error). Is this patch OK or what else should we use here? Pierre Muller GDB pascal language maintainer 2012-05-22 Pierre Muller * common/buffer.c (buffer_grow): ARI fix: Replace abort function call by gdb_assert macro use. Index: common/buffer.c =================================================================== RCS file: /cvs/src/src/gdb/common/buffer.c,v retrieving revision 1.3 diff -u -p -r1.3 buffer.c --- common/buffer.c 11 May 2012 22:24:22 -0000 1.3 +++ common/buffer.c 22 May 2012 09:10:27 -0000 @@ -23,6 +23,7 @@ #include "defs.h" #endif +#include "gdb_assert.h" #include "xml-utils.h" #include "buffer.h" @@ -47,8 +48,7 @@ buffer_grow (struct buffer *buffer, cons while (buffer->used_size + size > new_buffer_size) new_buffer_size *= 2; new_buffer = xrealloc (buffer->buffer, new_buffer_size); - if (!new_buffer) - abort (); + gdb_assert (new_buffer); memcpy (new_buffer + buffer->used_size, data, size); buffer->buffer = new_buffer; buffer->buffer_size = new_buffer_size;