/* xmalloc.c -- safe versions of malloc and realloc */
-/* Copyright (C) 1991-2009 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
This file is part of GNU Bash, the GNU Bourne Again SHell.
extern char *sbrk();
#endif
+#if defined (HAVE_SBRK) && defined (USING_BASH_MALLOC)
static PTR_T lbreak;
static int brkfound;
static size_t allocated;
+#endif
/* **************************************************************** */
/* */
/* */
/* **************************************************************** */
-#if defined (HAVE_SBRK)
+#if defined (HAVE_SBRK) && defined (USING_BASH_MALLOC)
+#define FINDBRK() \
+do { \
+ if (brkfound == 0) \
+ { \
+ lbreak = (PTR_T)sbrk (0); \
+ brkfound++; \
+ } \
+} while (0)
+
static size_t
findbrk ()
{
- if (brkfound == 0)
- {
- lbreak = (PTR_T)sbrk (0);
- brkfound++;
- }
+ FINDBRK();
return (char *)sbrk (0) - (char *)lbreak;
}
+#else
+#define FINDBRK()
#endif
+static void
+allocerr (func, bytes)
+ const char *func;
+ size_t bytes;
+{
+#if defined (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 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 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);
}
#ifdef USING_BASH_MALLOC
#include <malloc/shmalloc.h>
+static void
+sh_allocerr (func, bytes, file, line)
+ const char *func;
+ size_t bytes;
+ char *file;
+ int line;
+{
+#if defined (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;
{
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 */
- }
+ sh_allocerr ("xmalloc", bytes, file, line);
return (temp);
}
{
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);
}