Module: wine Branch: master Commit: 3f9c5d7682b1085fc79a9607e9ccb1df1088e267 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f9c5d7682b1085fc79a9607e...
Author: Huw Davies huw@codeweavers.com Date: Fri Jun 21 10:07:18 2019 +0100
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
---
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 5bf82c6..9a5c3cf 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; }