Zhiyi Zhang : winemac.drv: Zero initialize DEVMODE before passing it to EnumDisplaySettings().

Alexandre Julliard julliard at winehq.org
Tue Aug 11 16:26:50 CDT 2020


Module: wine
Branch: master
Commit: 6185252bbcd0d871c906d78299a4603f623ba4f0
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=6185252bbcd0d871c906d78299a4603f623ba4f0

Author: Zhiyi Zhang <zzhang at codeweavers.com>
Date:   Tue Aug 11 18:16:21 2020 +0800

winemac.drv: Zero initialize DEVMODE before passing it to EnumDisplaySettings().

EnumDisplaySettings() on Wine does not write beyond the end of DEVMODE because it doesn't use
dmDriverExtra currently, but this implementation detail should not be relied on.

Signed-off-by: Zhiyi Zhang <zzhang at codeweavers.com>
Signed-off-by: Ken Thomases <ken at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/winemac.drv/display.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c
index 522ff57d7a..9a80308e89 100644
--- a/dlls/winemac.drv/display.c
+++ b/dlls/winemac.drv/display.c
@@ -847,6 +847,7 @@ LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode,
 
     if (!devname && !devmode)
     {
+        memset(&default_mode, 0, sizeof(default_mode));
         default_mode.dmSize = sizeof(default_mode);
         if (!EnumDisplaySettingsExW(primary_adapter, ENUM_REGISTRY_SETTINGS, &default_mode, 0))
         {




More information about the wine-cvs mailing list