From 6950fc18e3676594fcfccae9dd470603692d26ef Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Mon, 23 Jun 2014 13:45:49 +0000 Subject: * malloc_wrapper.cc (mallinfo): Initialize m if external malloc is used, too (CID 60120). --- winsup/cygwin/ChangeLog | 5 +++++ winsup/cygwin/malloc_wrapper.cc | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'winsup/cygwin') diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 40656fcda..115b697d6 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2014-06-23 Corinna Vinschen + + * malloc_wrapper.cc (mallinfo): Initialize m if external malloc is used, + too (CID 60120). + 2014-06-23 Corinna Vinschen * localtime.cc (tzload): Fix leaking memory (CID 60001). 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 (); -- cgit v1.2.3