- deraadt 2001/02/07 8:57:26

     [xmalloc.c]
     deal with new ANSI malloc stuff
   - markus@cvs.openbsd.org 2001/02/07 16:46:08
     [xmalloc.c]
     typo in fatal()
   - itojun@cvs.openbsd.org 2001/02/07 18:04:50
     [xmalloc.c]
     fix size_t -> int cast (use u_long).  markus ok

diff --git a/ChangeLog b/ChangeLog
index 62a31627f39e84fb9568c9fcbe673665e003926b..c1a017ab0d8beb75ff51e18e564d2aa7bd0190e5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -83,6 +83,15 @@
    - deraadt@cvs.openbsd.org 2001/02/06 22:07:50
      [sshd_config]
      enable sftp-server by default
+   - deraadt 2001/02/07 8:57:26
+     [xmalloc.c]
+     deal with new ANSI malloc stuff
+   - markus@cvs.openbsd.org 2001/02/07 16:46:08
+     [xmalloc.c]
+     typo in fatal()
+   - itojun@cvs.openbsd.org 2001/02/07 18:04:50
+     [xmalloc.c]
+     fix size_t -> int cast (use u_long).  markus ok
  - (bal) fixed sftp-client.c.  Return 'status' instead of '0'  
    (from the OpenBSD tree)
  - (bal) Synced ssh.1, ssh-add.1 and sshd.8 w/ OpenBSD

diff --git a/xmalloc.c b/xmalloc.c
index 1a471889a34eccbd11d14441c95cadf03bb33dda..8a23b8b70ffd700854739bb059f85b1ba9cd1335 100644 (file)
--- a/xmalloc.c
+++ b/xmalloc.c
@@ -13,7 +13,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: xmalloc.c,v 1.11 2001/02/04 15:32:27 stevesk Exp $");
+RCSID("$OpenBSD: xmalloc.c,v 1.14 2001/02/07 18:04:50 itojun Exp $");
 
 #include "xmalloc.h"
 #include "log.h"
@@ -21,9 +21,13 @@ RCSID("$OpenBSD: xmalloc.c,v 1.11 2001/02/04 15:32:27 stevesk Exp $");
 void *
 xmalloc(size_t size)
 {
-       void *ptr = malloc(size);
+       void *ptr;
+
+       if (size == 0)
+               fatal("xmalloc: zero size");
+       ptr = malloc(size);
        if (ptr == NULL)
-               fatal("xmalloc: out of memory (allocating %d bytes)", (int) size);
+               fatal("xmalloc: out of memory (allocating %lu bytes)", (u_long) size);
        return ptr;
 }
 
@@ -32,11 +36,13 @@ xrealloc(void *ptr, size_t new_size)
 {
        void *new_ptr;
 
+       if (new_size == 0)
+               fatal("xrealloc: zero size");
        if (ptr == NULL)
                fatal("xrealloc: NULL pointer given as argument");
        new_ptr = realloc(ptr, new_size);
        if (new_ptr == NULL)
-               fatal("xrealloc: out of memory (new_size %d bytes)", (int) new_size);
+               fatal("xrealloc: out of memory (new_size %lu bytes)", (u_long) new_size);
        return new_ptr;
 }
 
@@ -52,8 +58,11 @@ char *
 xstrdup(const char *str)
 {
        size_t len = strlen(str) + 1;
+       char *cp;
 
-       char *cp = xmalloc(len);
+       if (len == 0)
+               fatal("xstrdup: zero size");
+       cp = xmalloc(len);
        strlcpy(cp, str, len);
        return cp;
 }