diff options
author | Damien Miller <djm@mindrot.org> | 2001-04-16 18:27:07 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2001-04-16 18:27:07 +1000 |
commit | 0b1e0a12183461a38d6c59b3e2511fdb7f96d534 (patch) | |
tree | 0bb267b497917602562cc7b9cb8759ac0231f949 /xmalloc.c | |
parent | 21134b5b09ad480a2283f1b63c0c1e3a68515274 (diff) |
- 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.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -13,7 +13,7 @@ | |||
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include "includes.h" | 15 | #include "includes.h" |
16 | RCSID("$OpenBSD: xmalloc.c,v 1.14 2001/02/07 18:04:50 itojun Exp $"); | 16 | RCSID("$OpenBSD: xmalloc.c,v 1.15 2001/04/16 08:05:34 deraadt Exp $"); |
17 | 17 | ||
18 | #include "xmalloc.h" | 18 | #include "xmalloc.h" |
19 | #include "log.h" | 19 | #include "log.h" |
@@ -39,8 +39,9 @@ xrealloc(void *ptr, size_t new_size) | |||
39 | if (new_size == 0) | 39 | if (new_size == 0) |
40 | fatal("xrealloc: zero size"); | 40 | fatal("xrealloc: zero size"); |
41 | if (ptr == NULL) | 41 | if (ptr == NULL) |
42 | fatal("xrealloc: NULL pointer given as argument"); | 42 | new_ptr = malloc(new_size); |
43 | new_ptr = realloc(ptr, new_size); | 43 | else |
44 | new_ptr = realloc(ptr, new_size); | ||
44 | if (new_ptr == NULL) | 45 | if (new_ptr == NULL) |
45 | fatal("xrealloc: out of memory (new_size %lu bytes)", (u_long) new_size); | 46 | fatal("xrealloc: out of memory (new_size %lu bytes)", (u_long) new_size); |
46 | return new_ptr; | 47 | return new_ptr; |