tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- deraadt@cvs.openbsd.org 2001/04/16 08:05:34 

[xmalloc.c]
     xrealloc dealing with ptr == nULL; mouring
This commit is contained in:
Damien Miller 2001-04-16 18:27:07 +10:00
parent 21134b5b09
commit 0b1e0a1218
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -27,6 +27,9 @@
[scp.c sftp.c] [scp.c sftp.c]
IPv6 support for sftp (which I bungled in my last patch) which is IPv6 support for sftp (which I bungled in my last patch) which is
borrowed from scp.c. Thanks to Markus@ for pointing it out. borrowed from scp.c. Thanks to Markus@ for pointing it out.
- deraadt@cvs.openbsd.org 2001/04/16 08:05:34
[xmalloc.c]
xrealloc dealing with ptr == nULL; mouring
20010415 20010415
- OpenBSD CVS Sync - OpenBSD CVS Sync
@ -5112,4 +5115,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.1125 2001/04/16 08:26:41 djm Exp $ $Id: ChangeLog,v 1.1126 2001/04/16 08:27:07 djm Exp $

7
xmalloc.c
View File

@ -13,7 +13,7 @@
*/ */
#include "includes.h" #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 "xmalloc.h"
#include "log.h" #include "log.h"
@ -39,8 +39,9 @@ xrealloc(void *ptr, size_t new_size)
if (new_size == 0) if (new_size == 0)
fatal("xrealloc: zero size"); fatal("xrealloc: zero size");
if (ptr == NULL) if (ptr == NULL)
fatal("xrealloc: NULL pointer given as argument"); new_ptr = malloc(new_size);
new_ptr = realloc(ptr, new_size); else
new_ptr = realloc(ptr, new_size);
if (new_ptr == NULL) if (new_ptr == NULL)
fatal("xrealloc: out of memory (new_size %lu bytes)", (u_long) new_size); fatal("xrealloc: out of memory (new_size %lu bytes)", (u_long) new_size);
return new_ptr; return new_ptr;