[PATCH] user32: Don't access a potentially uninitialized padded_border.

Huw Davies huw at codeweavers.com
Fri Jun 21 04:07:18 CDT 2019


Signed-off-by: Huw Davies <huw at codeweavers.com>
---
 dlls/user32/sysparams.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c
index 5bf82c66e0..9a5c3cf8d5 100644
--- a/dlls/user32/sysparams.c
+++ b/dlls/user32/sysparams.c
@@ -1753,8 +1753,11 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam,
               get_entry( &entry_MENULOGFONT, 0, &lpnm->lfMenuFont ) &&
               get_entry( &entry_STATUSLOGFONT, 0, &lpnm->lfStatusFont ) &&
               get_entry( &entry_MESSAGELOGFONT, 0, &lpnm->lfMessageFont );
-        lpnm->iBorderWidth += padded_border;
-        if (ret && lpnm->cbSize == sizeof(NONCLIENTMETRICSW)) lpnm->iPaddedBorderWidth = 0;
+        if (ret)
+        {
+            lpnm->iBorderWidth += padded_border;
+            if (lpnm->cbSize == sizeof(NONCLIENTMETRICSW)) lpnm->iPaddedBorderWidth = 0;
+        }
         normalize_nonclientmetrics( lpnm );
         break;
     }
-- 
2.18.0




More information about the wine-devel mailing list