From a16b9ff58334e47a170170a339f2bbb3ae942a80 Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Fri, 8 May 2020 16:41:12 +0200 Subject: [PATCH] comdlg32: Improve error handling in get_config_key_string. Signed-off-by: Jacek Caban Signed-off-by: Alexandre Julliard --- dlls/comdlg32/filedlg.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 6b79fcfc838..538358bd5f9 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -250,11 +250,10 @@ static BOOL get_config_key_string(HKEY hkey, const WCHAR *name, WCHAR **value) DWORD type, size; WCHAR *str; - if (hkey && !RegQueryValueExW(hkey, name, 0, &type, NULL, &size)) - { - if (type != REG_SZ && type != REG_EXPAND_SZ) - return FALSE; - } + if (RegQueryValueExW(hkey, name, 0, &type, NULL, &size)) + return FALSE; + if (type != REG_SZ && type != REG_EXPAND_SZ) + return FALSE; str = heap_alloc(size); if (RegQueryValueExW(hkey, name, 0, &type, (BYTE *)str, &size))