From: Arthur Miller Date: Tue, 21 Jan 2025 18:10:14 +0000 (+0100) Subject: Fix bug in w32_memory_info X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=afbcc7e9188a7ef5c36da79949e6e0811f93df80;p=emacs.git Fix bug in w32_memory_info * src/w32.c (w32_memory_info): Initialize struct size. (cherry picked from commit 58d3d4820ad327f07cea5894a9675bf30553461e) --- diff --git a/src/w32.c b/src/w32.c index deeca031f64..92734383445 100644 --- a/src/w32.c +++ b/src/w32.c @@ -7681,7 +7681,7 @@ w32_memory_info (unsigned long long *totalram, unsigned long long *freeram, { MEMORYSTATUS memst; MEMORY_STATUS_EX memstex; - + memstex.dwLength = sizeof(memstex); /* Use GlobalMemoryStatusEx if available, as it can report more than 2GB of memory. */ if (global_memory_status_ex (&memstex)) @@ -7692,7 +7692,9 @@ w32_memory_info (unsigned long long *totalram, unsigned long long *freeram, *freeswap = memstex.ullAvailPageFile; return 0; } - else if (global_memory_status (&memst)) + + memst.dwLength = sizeof(memst); + if (global_memory_status (&memst)) { *totalram = memst.dwTotalPhys; *freeram = memst.dwAvailPhys;