From: Daniel Gustafsson <daniel@yesql.se>
Date: Sun, 18 Nov 2018 20:57:00 +0000 (+0100)
Subject: tool_doswin: Fix uninitialized field warning
X-Git-Tag: curl-7_63_0~68
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b88bf6e650a866330e5e6204e655bc4015c96a72;p=thirdparty%2Fcurl.git

tool_doswin: Fix uninitialized field warning

The partial struct initialization in 397664a065abffb7c3445ca9 caused
a warning on uninitialized MODULEENTRY32 struct members:

  /src/tool_doswin.c:681:3: warning: missing initializer for field
  'th32ModuleID' of 'MODULEENTRY32 {aka struct tagMODULEENTRY32}'
  [-Wmissing-field-initializers]

This is sort of a bogus warning as the remaining members will be set
to zero by the compiler, as all omitted members are. Nevertheless,
remove the warning by omitting all members and setting the dwSize
members explicitly.

Closes #3254
Reviewed-by: Marcel Raad <Marcel.Raad@teamviewer.com>
Reviewed-by: Jay Satiro <raysatiro@yahoo.com>
---

diff --git a/src/tool_doswin.c b/src/tool_doswin.c
index 012ede5ace..f360b92e67 100644
--- a/src/tool_doswin.c
+++ b/src/tool_doswin.c
@@ -678,9 +678,11 @@ CURLcode FindWin32CACert(struct OperationConfig *config,
 struct curl_slist *GetLoadedModulePaths(void)
 {
   HANDLE hnd = INVALID_HANDLE_VALUE;
-  MODULEENTRY32 mod = { sizeof(mod), };
+  MODULEENTRY32 mod = {0};
   struct curl_slist *slist = NULL;
 
+  mod.dwSize = sizeof(MODULEENTRY32);
+
   do {
     hnd = CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, 0);
   } while(hnd == INVALID_HANDLE_VALUE && GetLastError() == ERROR_BAD_LENGTH);