user32: Don't access a potentially uninitialized padded_border.

Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

user32: Don't access a potentially uninitialized padded_border.
3f9c5d76 · Huw Davies · Alexandre Julliard · b00a45cc · 3f9c5d76
Commit 3f9c5d76 authored Jun 21, 2019 by Huw Davies Committed by Alexandre Julliard Jun 21, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

sysparams.c dlls/user32/sysparams.c +5 -2

No files found.
--- 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;
    }