/* xmalloc.c -- safe versions of malloc and realloc */
-/* Copyright (C) 1991 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2016,2023 Free Software Foundation, Inc.
- This file is part of GNU Readline, a library for reading lines
- of text with interactive input and history editing.
+ This file is part of GNU Bash, the GNU Bourne Again SHell.
- Readline is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 2, or (at your option) any
- later version.
+ Bash is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- Readline is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Bash is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Readline; see the file COPYING. If not, write to the Free
- Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+ along with Bash. If not, see <http://www.gnu.org/licenses/>.
+*/
#if defined (HAVE_CONFIG_H)
#include <config.h>
#include "bashintl.h"
#if !defined (PTR_T)
-# if defined (__STDC__)
-# define PTR_T void *
-# else
-# define PTR_T char *
-# endif /* !__STDC__ */
+# define PTR_T void *
#endif /* !PTR_T */
-#if defined (HAVE_SBRK) && !HAVE_DECL_SBRK
+#if HAVE_SBRK && !HAVE_DECL_SBRK
extern char *sbrk();
#endif
+#if HAVE_SBRK && defined (USING_BASH_MALLOC)
static PTR_T lbreak;
static int brkfound;
static size_t allocated;
+#endif
/* **************************************************************** */
/* */
/* */
/* **************************************************************** */
-#if defined (HAVE_SBRK)
+#if HAVE_SBRK && defined (USING_BASH_MALLOC)
+#define FINDBRK() \
+do { \
+ if (brkfound == 0) \
+ { \
+ lbreak = (PTR_T)sbrk (0); \
+ brkfound++; \
+ } \
+} while (0)
+
static size_t
-findbrk ()
+findbrk (void)
{
- if (brkfound == 0)
- {
- lbreak = (PTR_T)sbrk (0);
- brkfound++;
- }
+ FINDBRK();
return (char *)sbrk (0) - (char *)lbreak;
}
+#else
+#define FINDBRK()
#endif
+static void
+allocerr (const char *func, size_t bytes)
+{
+#if HAVE_SBRK && defined (USING_BASH_MALLOC)
+ allocated = findbrk ();
+ fatal_error (_("%s: cannot allocate %lu bytes (%lu bytes allocated)"), func, (unsigned long)bytes, (unsigned long)allocated);
+#else
+ fatal_error (_("%s: cannot allocate %lu bytes"), func, (unsigned long)bytes);
+#endif /* !HAVE_SBRK */
+}
+
/* Return a pointer to free()able block of memory large enough
to hold BYTES number of bytes. If the memory cannot be allocated,
print an error message and abort. */
PTR_T
-xmalloc (bytes)
- size_t bytes;
+xmalloc (size_t bytes)
{
PTR_T temp;
+#if defined (DEBUG)
+ if (bytes == 0)
+ internal_warning("xmalloc: size argument is 0");
+#endif
+
+ FINDBRK();
temp = malloc (bytes);
if (temp == 0)
- {
-#if defined (HAVE_SBRK)
- allocated = findbrk ();
- fatal_error (_("xmalloc: cannot allocate %lu bytes (%lu bytes allocated)"), (unsigned long)bytes, (unsigned long)allocated);
-#else
- fatal_error (_("xmalloc: cannot allocate %lu bytes"), (unsigned long)bytes);
-#endif /* !HAVE_SBRK */
- }
+ allocerr ("xmalloc", bytes);
return (temp);
}
PTR_T
-xrealloc (pointer, bytes)
- PTR_T pointer;
- size_t bytes;
+xrealloc (PTR_T pointer, size_t bytes)
{
PTR_T temp;
+#if defined (DEBUG)
+ if (bytes == 0)
+ internal_warning("xrealloc: size argument is 0");
+#endif
+
+ FINDBRK();
temp = pointer ? realloc (pointer, bytes) : malloc (bytes);
if (temp == 0)
- {
-#if defined (HAVE_SBRK)
- allocated = findbrk ();
- fatal_error (_("xrealloc: cannot reallocate %lu bytes (%lu bytes allocated)"), (unsigned long)bytes, (unsigned long)allocated);
-#else
- fatal_error (_("xrealloc: cannot allocate %lu bytes"), (unsigned long)bytes);
-#endif /* !HAVE_SBRK */
- }
+ allocerr ("xrealloc", bytes);
return (temp);
}
/* 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;
+xfree (PTR_T string)
{
if (string)
free (string);
#ifdef USING_BASH_MALLOC
#include <malloc/shmalloc.h>
-extern char *rl_completer_word_break_characters;
+static void
+sh_allocerr (const char *func, size_t bytes, char *file, int line)
+{
+#if HAVE_SBRK
+ allocated = findbrk ();
+ fatal_error (_("%s: %s:%d: cannot allocate %lu bytes (%lu bytes allocated)"), func, file, line, (unsigned long)bytes, (unsigned long)allocated);
+#else
+ fatal_error (_("%s: %s:%d: cannot allocate %lu bytes"), func, file, line, (unsigned long)bytes);
+#endif /* !HAVE_SBRK */
+}
+
PTR_T
-sh_xmalloc (bytes, file, line)
- size_t bytes;
- char *file;
- int line;
+sh_xmalloc (size_t bytes, char *file, int line)
{
PTR_T temp;
+#if defined (DEBUG)
+ if (bytes == 0)
+ internal_warning("xmalloc: %s:%d: size argument is 0", file, line);
+#endif
+
+ FINDBRK();
temp = sh_malloc (bytes, file, line);
if (temp == 0)
- {
-#if defined (HAVE_SBRK)
- allocated = findbrk ();
- fatal_error (_("xmalloc: %s:%d: cannot allocate %lu bytes (%lu bytes allocated)"), file, line, (unsigned long)bytes, (unsigned long)allocated);
-#else
- fatal_error (_("xmalloc: %s:%d: cannot allocate %lu bytes"), file, line, (unsigned long)bytes);
-#endif /* !HAVE_SBRK */
- }
-
-if (temp == rl_completer_word_break_characters)
- itrace("xmalloc:%s:%d: reallocating rl_completer_word_break_characters");
+ sh_allocerr ("xmalloc", bytes, file, line);
return (temp);
}
PTR_T
-sh_xrealloc (pointer, bytes, file, line)
- PTR_T pointer;
- size_t bytes;
- char *file;
- int line;
+sh_xrealloc (PTR_T pointer, size_t bytes, char *file, int line)
{
PTR_T temp;
+#if defined (DEBUG)
+ if (bytes == 0)
+ internal_warning("xrealloc: %s:%d: size argument is 0", file, line);
+#endif
+
+ FINDBRK();
temp = pointer ? sh_realloc (pointer, bytes, file, line) : sh_malloc (bytes, file, line);
if (temp == 0)
- {
-#if defined (HAVE_SBRK)
- allocated = findbrk ();
- fatal_error (_("xrealloc: %s:%d: cannot reallocate %lu bytes (%lu bytes allocated)"), file, line, (unsigned long)bytes, (unsigned long)allocated);
-#else
- fatal_error (_("xrealloc: %s:%d: cannot allocate %lu bytes"), file, line, (unsigned long)bytes);
-#endif /* !HAVE_SBRK */
- }
+ sh_allocerr ("xrealloc", bytes, file, line);
return (temp);
}
void
-sh_xfree (string, file, line)
- PTR_T string;
- char *file;
- int line;
+sh_xfree (PTR_T string, char *file, int line)
{
if (string)
sh_free (string, file, line);