- (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.

diff --git a/ChangeLog b/ChangeLog
index 9efb6d0589e22e3816385ad0d425b4cc0ef9c064..99f6108956cf0b864834e1dce9fab62de4110482 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 6ba9bd9865d363cf6a7eb49fabf563269be91133..3d7885186201695ba6af1fa912b75e992e970a90 100644 (file)
--- 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