diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2006-03-22 19:46:12 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2006-03-22 19:46:12 +0000 |
| commit | 4f87d658747b4e9afbd29979d608b4f4514eacce (patch) | |
| tree | bf4113ad3b30c5e35122ae795982576771eb6480 /crypto/openssh/openbsd-compat/bsd-misc.c | |
| parent | 3a4d58a91ac10dda83e9325d590b63ca9608af67 (diff) | |
| parent | 021d409f5beb1827f72d24f171e3c3ed233ed62a (diff) | |
| download | src-4f87d658747b4e9afbd29979d608b4f4514eacce.tar.gz src-4f87d658747b4e9afbd29979d608b4f4514eacce.zip | |
This commit was generated by cvs2svn to compensate for changes in r157016,
which included commits to RCS files with non-trunk default branches.
Notes
Notes:
svn path=/head/; revision=157017
Diffstat (limited to 'crypto/openssh/openbsd-compat/bsd-misc.c')
| -rw-r--r-- | crypto/openssh/openbsd-compat/bsd-misc.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/crypto/openssh/openbsd-compat/bsd-misc.c b/crypto/openssh/openbsd-compat/bsd-misc.c index 6ba9bd9865d3..d32b054d7227 100644 --- a/crypto/openssh/openbsd-compat/bsd-misc.c +++ b/crypto/openssh/openbsd-compat/bsd-misc.c @@ -18,7 +18,7 @@ #include "includes.h" #include "xmalloc.h" -RCSID("$Id: bsd-misc.c,v 1.27 2005/05/27 11:13:41 dtucker Exp $"); +RCSID("$Id: bsd-misc.c,v 1.28 2005/11/01 22:07:31 dtucker Exp $"); #ifndef HAVE___PROGNAME char *__progname; @@ -223,10 +223,7 @@ strdup(const char *str) len = strlen(str) + 1; cp = malloc(len); if (cp != NULL) - if (strlcpy(cp, str, len) != len) { - free(cp); - return NULL; - } - return cp; + return(memcpy(cp, str, len)); + return NULL; } #endif |