From: Paul Eggert <eggert@cs.ucla.edu>
To: Bruno Haible <bruno@clisp.org>
Cc: Gnulib bugs <bug-gnulib@gnu.org>
Subject: Re: [PATCH] malloc, realloc: fix recently-introduced #undef typos
Date: Wed, 21 Apr 2021 11:54:52 -0700 [thread overview]
Message-ID: <e8819cdc-949b-8703-2d01-0e89e05a5cff@cs.ucla.edu> (raw)
In-Reply-To: <8c7877c5-2563-a41a-eb29-6d80bbe3ab4b@cs.ucla.edu>
[-- Attachment #1: Type: text/plain, Size: 536 bytes --]
On 4/18/21 4:24 PM, Paul Eggert wrote:
> Yes, they were typos that caused infloops. But little harm done; I don't
> think they escaped into any distributions.
Whoops, I take it back. Because those modules defined
_GL_USE_STDLIB_ALLOC, stdlib.h did not define malloc and realloc and so
the undefs were not needed. And as it was, realloc-gnu did not work on
AIX 7.1 because the realloc replacement assumed the malloc replacement.
I fixed this by installing the attached two patches. It's still a bit
messy but at least it works.
[-- Attachment #2: 0001-malloc-simplify.patch --]
[-- Type: text/x-patch, Size: 1444 bytes --]
From 147828bccdcbb7af648d24ef9eaa68e9cb6b89d2 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 21 Apr 2021 11:09:01 -0700
Subject: [PATCH 1/2] malloc: simplify
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* lib/malloc.c: Omit unnecessary "#undef malloc".
I recently introduced it by mistake. This module defines
_GL_USE_STDLIB_ALLOC and so malloc isn’t redefined to rpl_malloc.
---
ChangeLog | 5 +++++
lib/malloc.c | 3 ---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index e72362077..b013d915f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2021-04-21 Paul Eggert <eggert@cs.ucla.edu>
+ malloc: simplify
+ * lib/malloc.c: Omit unnecessary "#undef malloc".
+ I recently introduced it by mistake. This module defines
+ _GL_USE_STDLIB_ALLOC and so malloc isn’t redefined to rpl_malloc.
+
malloca: avoid ptrdiff_t overflow
* lib/malloca.c: Include idx.h, intprops.h.
(mmalloca): Check for ptrdiff_t overflow. Since this module uses
diff --git a/lib/malloc.c b/lib/malloc.c
index a900046ec..30f791fb9 100644
--- a/lib/malloc.c
+++ b/lib/malloc.c
@@ -26,9 +26,6 @@
#include "xalloc-oversized.h"
-/* Call the system's malloc below. */
-# undef malloc
-
/* Allocate an N-byte block of memory from the heap, even if N is 0. */
void *
--
2.27.0
[-- Attachment #3: 0002-realloc-port-to-AIX-7.1.patch --]
[-- Type: text/x-patch, Size: 1478 bytes --]
From 882243dcfe41bd703db61af56e954d8dff3369ce Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 21 Apr 2021 11:10:06 -0700
Subject: [PATCH 2/2] realloc: port to AIX 7.1
* lib/realloc.c (_GL_USE_STDLIB_ALLOC): Do not define. This
module relies on GNU malloc. This fixes a test failure on AIX 7.1.
---
ChangeLog | 4 ++++
lib/realloc.c | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b013d915f..579284336 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2021-04-21 Paul Eggert <eggert@cs.ucla.edu>
+ realloc: port to AIX 7.1
+ * lib/realloc.c (_GL_USE_STDLIB_ALLOC): Do not define. This
+ module relies on GNU malloc. This fixes a test failure on AIX 7.1.
+
malloc: simplify
* lib/malloc.c: Omit unnecessary "#undef malloc".
I recently introduced it by mistake. This module defines
diff --git a/lib/realloc.c b/lib/realloc.c
index c0d94b439..0c87d0d92 100644
--- a/lib/realloc.c
+++ b/lib/realloc.c
@@ -18,7 +18,6 @@
/* written by Jim Meyering and Bruno Haible */
-#define _GL_USE_STDLIB_ALLOC 1
#include <config.h>
#include <stdlib.h>
@@ -27,7 +26,8 @@
#include "xalloc-oversized.h"
-/* Call the system's realloc below. */
+/* Call the system's realloc below. This file does not define
+ _GL_USE_STDLIB_ALLOC because it needs Gnulib's malloc if present. */
#undef realloc
/* Change the size of an allocated block of memory P to N bytes,
--
2.27.0
prev parent reply other threads:[~2021-04-21 18:55 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-17 0:07 [PATCH] malloc, realloc: fix recently-introduced #undef typos Paul Eggert
2021-04-17 2:53 ` Bruno Haible
2021-04-18 23:24 ` Paul Eggert
2021-04-21 18:54 ` Paul Eggert [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://lists.gnu.org/mailman/listinfo/bug-gnulib
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e8819cdc-949b-8703-2d01-0e89e05a5cff@cs.ucla.edu \
--to=eggert@cs.ucla.edu \
--cc=bruno@clisp.org \
--cc=bug-gnulib@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).