Prevent buffer overruns.

[~andy/fetchmail] / xmalloc.c

diff --git a/xmalloc.c b/xmalloc.c
index b5d03f89c1444d7de83a26d99add65e9c99a2ad5..0ce0905330b3c805eb8bb3d55da5e0cfd9d91bd6 100644 (file)
--- a/xmalloc.c
+++ b/xmalloc.c
@@ -1,20 +1,16 @@
-/* Copyright 1993-95 by Carl Harris, Jr. Copyright 1996 by Eric S. Raymond
- * All rights reserved.
+/*
+ * xmalloc.c -- allocate space or die 
+ *
  * For license terms, see the file COPYING in this directory.
  */
 
-/***********************************************************************
-  module:       xmalloc.c
-  project:      fetchmail
-  programmer:   Carl Harris, ceharris@mal.com
-  description:  malloc wrapper.
-
- ***********************************************************************/
-
-
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
-#include <sys/types.h>
+#include <errno.h>
+#include <string.h>
+#if defined(STDC_HEADERS)
+#include  <stdlib.h>
+#endif
 #include "fetchmail.h"
 
 #if defined(HAVE_VOIDPOINTER)
@@ -24,15 +20,33 @@
 #endif
 
 XMALLOCTYPE *
-xmalloc (n)
-size_t n;
+xmalloc (int n)
+{
+    XMALLOCTYPE *p;
+
+    p = (XMALLOCTYPE *) malloc(n);
+    if (p == (XMALLOCTYPE *) 0)
+       error(PS_UNDEFINED, errno, "malloc failed");
+    return(p);
+}
+
+XMALLOCTYPE *
+xrealloc (XMALLOCTYPE *p, int n)
 {
-  XMALLOCTYPE *p;
+    if (p == 0)
+       return xmalloc (n);
+    p = (XMALLOCTYPE *) realloc(p, n);
+    if (p == (XMALLOCTYPE *) 0)
+       error(PS_UNDEFINED, errno, "realloc failed");
+    return p;
+}
 
-  p = (XMALLOCTYPE *) malloc(n);
-  if (p == (XMALLOCTYPE *) 0) {
-    fputs("malloc failed\n",stderr);
-    exit(PS_UNDEFINED);
-  }
-  return(p);
+char *xstrdup(const char *s)
+{
+    char *p;
+    p = (char *) xmalloc(strlen(s)+1);
+    strcpy(p,s);
+    return p;
 }
+
+/* xmalloc.c ends here */