summaryrefslogtreecommitdiff
path: root/xmalloc.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2001-04-16 18:27:07 +1000
committerDamien Miller <djm@mindrot.org>2001-04-16 18:27:07 +1000
commit0b1e0a12183461a38d6c59b3e2511fdb7f96d534 (patch)
tree0bb267b497917602562cc7b9cb8759ac0231f949 /xmalloc.c
parent21134b5b09ad480a2283f1b63c0c1e3a68515274 (diff)
downloadopenssh-git-0b1e0a12183461a38d6c59b3e2511fdb7f96d534.tar.gz
- deraadt@cvs.openbsd.org 2001/04/16 08:05:34
[xmalloc.c] xrealloc dealing with ptr == nULL; mouring
Diffstat (limited to 'xmalloc.c')
-rw-r--r--xmalloc.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/xmalloc.c b/xmalloc.c
index 8a23b8b7..50466274 100644
--- a/xmalloc.c
+++ b/xmalloc.c
@@ -13,7 +13,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: xmalloc.c,v 1.14 2001/02/07 18:04:50 itojun Exp $");
+RCSID("$OpenBSD: xmalloc.c,v 1.15 2001/04/16 08:05:34 deraadt Exp $");
#include "xmalloc.h"
#include "log.h"
@@ -39,8 +39,9 @@ xrealloc(void *ptr, size_t new_size)
if (new_size == 0)
fatal("xrealloc: zero size");
if (ptr == NULL)
- fatal("xrealloc: NULL pointer given as argument");
- new_ptr = realloc(ptr, new_size);
+ new_ptr = malloc(new_size);
+ else
+ new_ptr = realloc(ptr, new_size);
if (new_ptr == NULL)
fatal("xrealloc: out of memory (new_size %lu bytes)", (u_long) new_size);
return new_ptr;