diff options
-rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
-rw-r--r-- | winsup/cygwin/malloc_wrapper.cc | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 40656fcda..115b697d6 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,10 @@ 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). 2014-06-23 Corinna Vinschen <corinna@vinschen.de> diff --git a/winsup/cygwin/malloc_wrapper.cc b/winsup/cygwin/malloc_wrapper.cc index 17347ae3d..68c851440 100644 --- 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 (); |