From 3f9c5d7682b1085fc79a9607e9ccb1df1088e267 Mon Sep 17 00:00:00 2001 From: Huw Davies Date: Fri, 21 Jun 2019 10:07:18 +0100 Subject: [PATCH] user32: Don't access a potentially uninitialized padded_border. Signed-off-by: Huw Davies Signed-off-by: Alexandre Julliard --- 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 5bf82c66e00..9a5c3cf8d55 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; }