[xmalloc.c]
     no zero size xstrdup() error; ok markus@
This commit is contained in:
Ben Lindstrom 2001-08-06 21:03:23 +00:00
parent 940fb86c9a
commit ff6458e03e
2 changed files with 7 additions and 5 deletions

View File

@ -26,6 +26,9 @@
- stevesk@cvs.openbsd.org 2001/07/23 18:14:58 - stevesk@cvs.openbsd.org 2001/07/23 18:14:58
[auth2.c auth-rsa.c] [auth2.c auth-rsa.c]
use %lu; ok markus@ use %lu; ok markus@
- stevesk@cvs.openbsd.org 2001/07/23 18:21:46
[xmalloc.c]
no zero size xstrdup() error; ok markus@
20010803 20010803
- (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on - (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on
@ -6136,4 +6139,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - 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 $

View File

@ -13,7 +13,7 @@
*/ */
#include "includes.h" #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 "xmalloc.h"
#include "log.h" #include "log.h"
@ -58,11 +58,10 @@ xfree(void *ptr)
char * char *
xstrdup(const char *str) xstrdup(const char *str)
{ {
size_t len = strlen(str) + 1; size_t len;
char *cp; char *cp;
if (len == 0) len = strlen(str) + 1;
fatal("xstrdup: zero size");
cp = xmalloc(len); cp = xmalloc(len);
strlcpy(cp, str, len); strlcpy(cp, str, len);
return cp; return cp;