* malloc_wrapper.cc (mallinfo): Initialize m if external malloc is used,

	too (CID 60120).

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 40656fcda658e3f7e699e2989fdc35da8c4b281e..115b697d6b7fc599a54515b917d03cde9d002f0f 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-23  Corinna Vinschen  <corinna@vinschen.de>
+
+       * malloc_wrapper.cc (mallinfo): Initialize m if external malloc is used,
+       too (CID 60120).
+
 2014-06-23  Corinna Vinschen  <corinna@vinschen.de>
 
        * localtime.cc (tzload): Fix leaking memory (CID 60001).

diff --git a/winsup/cygwin/malloc_wrapper.cc b/winsup/cygwin/malloc_wrapper.cc
index 17347ae3dd21fcbaefcb98837be51f6fd0225ef3..68c851440afece3db8da10bcbdc44d6d0201efc1 100644 (file)
--- a/winsup/cygwin/malloc_wrapper.cc
+++ b/winsup/cygwin/malloc_wrapper.cc
@@ -241,7 +241,10 @@ mallinfo ()
 {
   struct mallinfo m;
   if (!use_internal)
-    set_errno (ENOSYS);
+    {
+      memset (&m, 0, sizeof m);
+      set_errno (ENOSYS);
+    }
   else
     {
       __malloc_lock ();