diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2005-11-02 09:06:50 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2005-11-02 09:06:50 +1100 |
| commit | e8121e2215550798df063462c792e31628ab7f59 (patch) | |
| tree | 6290a31fc7387acf8f9518eb9e03b39f7e7e3b98 | |
| parent | aa080fd37657ae4c164ba5ebc709f641949f6e19 (diff) | |
- (dtucker) [openbsd-compat/bsd-misc.c] Bug #1108: fix broken strdup().V_4_2
Reported by olavi at ipunplugged.com and antoine.brodin at laposte.net
via FreeBSD.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | openbsd-compat/bsd-misc.c | 9 |
2 files changed, 12 insertions, 7 deletions
@@ -1,3 +1,11 @@ +20051102 + - (dtucker) [openbsd-compat/bsd-misc.c] Bug #1108: fix broken strdup(). + Reported by olavi at ipunplugged.com and antoine.brodin at laposte.net + via FreeBSD. + + 20051030 + - (djm) [contrib/suse/openssh.spec contrib/suse/rc. + sshd contrib/suse/sysconfig.ssh] Bug #1106: Updated SuSE spec and init 20051025 - (dtucker) [configure.ac] Relocate LLONG_MAX calculation to after the sizeof(long long) checks, to make fixing bug #1104 easier (no changes @@ -3047,4 +3055,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3887.2.14 2005/10/25 08:51:48 dtucker Exp $ +$Id: ChangeLog,v 1.3887.2.15 2005/11/01 22:06:50 dtucker Exp $ diff --git a/openbsd-compat/bsd-misc.c b/openbsd-compat/bsd-misc.c index 6ba9bd98..3d788518 100644 --- a/openbsd-compat/bsd-misc.c +++ b/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.27.2.1 2005/11/01 22:06:50 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 |