From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id 38D093858407; Wed, 8 Sep 2021 08:17:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 38D093858407 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: fix initializing MEM_EXTENDED_PARAMETER, take 2 X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/master X-Git-Oldrev: b52f10c4ca02216005f2eba3b968b4504098959b X-Git-Newrev: 8fba45f0ccc3b936edfb93671141bf3fe0b0ee5e Message-Id: <20210908081710.38D093858407@sourceware.org> Date: Wed, 8 Sep 2021 08:17:10 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Sep 2021 08:17:10 -0000 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=8fba45f0ccc3b936edfb93671141bf3fe0b0ee5e commit 8fba45f0ccc3b936edfb93671141bf3fe0b0ee5e Author: Corinna Vinschen Date: Wed Sep 8 10:07:46 2021 +0200 Cygwin: fix initializing MEM_EXTENDED_PARAMETER, take 2 In https://cygwin.com/pipermail/cygwin/2021-September/249361.html Brian pointed out that initializing the structure would be more future proof, should the developers at Microsoft ever decide to split the Reserved field and use some bits of the struct for other purposes. Fixes: 3d322ac930ca ("Cygwin: fix initializing MEM_EXTENDED_PARAMETER") Signed-off-by: Corinna Vinschen Diff: --- winsup/cygwin/miscfuncs.cc | 6 ++---- winsup/cygwin/mmap.cc | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/winsup/cygwin/miscfuncs.cc b/winsup/cygwin/miscfuncs.cc index b544e7125..024ad70ba 100644 --- a/winsup/cygwin/miscfuncs.cc +++ b/winsup/cygwin/miscfuncs.cc @@ -517,9 +517,8 @@ class thread_allocator THREAD_STACK_SLOT }; /* g++ 11.2 workaround: don't use initializer */ - MEM_EXTENDED_PARAMETER thread_ext; + MEM_EXTENDED_PARAMETER thread_ext = { 0 }; thread_ext.Type = MemExtendedParameterAddressRequirements; - thread_ext.Reserved = 0; thread_ext.Pointer = (PVOID) &thread_req; SIZE_T real_size = roundup2 (size, THREAD_STACK_SLOT); @@ -539,9 +538,8 @@ class thread_allocator THREAD_STACK_SLOT }; /* g++ 11.2 workaround: don't use initializer */ - MEM_EXTENDED_PARAMETER mmap_ext; + MEM_EXTENDED_PARAMETER mmap_ext = { 0 }; mmap_ext.Type = MemExtendedParameterAddressRequirements; - mmap_ext.Reserved = 0; mmap_ext.Pointer = (PVOID) &mmap_req; real_stackaddr = VirtualAlloc2 (GetCurrentProcess(), NULL, real_size, diff --git a/winsup/cygwin/mmap.cc b/winsup/cygwin/mmap.cc index 2e202a047..7982fd18e 100644 --- a/winsup/cygwin/mmap.cc +++ b/winsup/cygwin/mmap.cc @@ -207,9 +207,8 @@ MapView (HANDLE h, void *addr, size_t len, DWORD openflags, 0 }; /* g++ 11.2 workaround: don't use initializer */ - MEM_EXTENDED_PARAMETER mmap_ext; + MEM_EXTENDED_PARAMETER mmap_ext = { 0 }; mmap_ext.Type = MemExtendedParameterAddressRequirements; - mmap_ext.Reserved = 0; mmap_ext.Pointer = (PVOID) &mmap_req; alloc_type |= attached (prot) ? MEM_RESERVE : 0; @@ -1628,9 +1627,8 @@ fhandler_dev_zero::mmap (caddr_t *addr, size_t len, int prot, 0 }; /* g++ 11.2 workaround: don't use initializer */ - MEM_EXTENDED_PARAMETER mmap_ext; + MEM_EXTENDED_PARAMETER mmap_ext = { 0 }; mmap_ext.Type = MemExtendedParameterAddressRequirements; - mmap_ext.Reserved = 0; mmap_ext.Pointer = (PVOID) &mmap_req; base = VirtualAlloc2 (GetCurrentProcess(), *addr, len, alloc_type,