summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-08-06 21:03:23 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-08-06 21:03:23 +0000
commitff6458e03e64e0942379bed22119e902e4cc2b08 (patch)
tree538cf7c5c8ecdbfc8724ff7c85e9792caee3bc21
parent940fb86c9a0ff501f812041ebaad09538c09b1b8 (diff)
downloadopenssh-git-ff6458e03e64e0942379bed22119e902e4cc2b08.tar.gz
- stevesk@cvs.openbsd.org 2001/07/23 18:21:46
[xmalloc.c] no zero size xstrdup() error; ok markus@
-rw-r--r--ChangeLog5
-rw-r--r--xmalloc.c7
2 files changed, 7 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index bab4413e..c81e10dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,9 @@
- stevesk@cvs.openbsd.org 2001/07/23 18:14:58
[auth2.c auth-rsa.c]
use %lu; ok markus@
+ - stevesk@cvs.openbsd.org 2001/07/23 18:21:46
+ [xmalloc.c]
+ no zero size xstrdup() error; ok markus@
20010803
- (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on
@@ -6136,4 +6139,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1433 2001/08/06 21:01:49 mouring Exp $
+$Id: ChangeLog,v 1.1434 2001/08/06 21:03:23 mouring Exp $
diff --git a/xmalloc.c b/xmalloc.c
index 50466274..99c6ac33 100644
--- a/xmalloc.c
+++ b/xmalloc.c
@@ -13,7 +13,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: xmalloc.c,v 1.15 2001/04/16 08:05:34 deraadt Exp $");
+RCSID("$OpenBSD: xmalloc.c,v 1.16 2001/07/23 18:21:46 stevesk Exp $");
#include "xmalloc.h"
#include "log.h"
@@ -58,11 +58,10 @@ xfree(void *ptr)
char *
xstrdup(const char *str)
{
- size_t len = strlen(str) + 1;
+ size_t len;
char *cp;
- if (len == 0)
- fatal("xstrdup: zero size");
+ len = strlen(str) + 1;
cp = xmalloc(len);
strlcpy(cp, str, len);
return cp;