diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | xmalloc.c | 7 |
2 files changed, 8 insertions, 4 deletions
@@ -27,6 +27,9 @@ | |||
27 | [scp.c sftp.c] | 27 | [scp.c sftp.c] |
28 | IPv6 support for sftp (which I bungled in my last patch) which is | 28 | IPv6 support for sftp (which I bungled in my last patch) which is |
29 | borrowed from scp.c. Thanks to Markus@ for pointing it out. | 29 | borrowed from scp.c. Thanks to Markus@ for pointing it out. |
30 | - deraadt@cvs.openbsd.org 2001/04/16 08:05:34 | ||
31 | [xmalloc.c] | ||
32 | xrealloc dealing with ptr == nULL; mouring | ||
30 | 33 | ||
31 | 20010415 | 34 | 20010415 |
32 | - OpenBSD CVS Sync | 35 | - OpenBSD CVS Sync |
@@ -5112,4 +5115,4 @@ | |||
5112 | - Wrote replacements for strlcpy and mkdtemp | 5115 | - Wrote replacements for strlcpy and mkdtemp |
5113 | - Released 1.0pre1 | 5116 | - Released 1.0pre1 |
5114 | 5117 | ||
5115 | $Id: ChangeLog,v 1.1125 2001/04/16 08:26:41 djm Exp $ | 5118 | $Id: ChangeLog,v 1.1126 2001/04/16 08:27:07 djm Exp $ |
@@ -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; |