Alistair Leslie-Hughes : advapi32: Don't read a value that might be uninitialized (Coverity).
Alexandre Julliard
julliard at winehq.org
Mon Nov 25 09:12:28 CST 2019
Module: wine
Branch: stable
Commit: be4553a8074499b7ea586f84132056921ff6bf67
URL: https://source.winehq.org/git/wine.git/?a=commit;h=be4553a8074499b7ea586f84132056921ff6bf67
Author: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Date: Mon Jun 17 06:28:43 2019 +0000
advapi32: Don't read a value that might be uninitialized (Coverity).
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit 1b714ca0886aed265f85f6a661e3058f9f7c56a1)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
dlls/advapi32/registry.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c
index 14604e010e..bb5c6d32ed 100644
--- a/dlls/advapi32/registry.c
+++ b/dlls/advapi32/registry.c
@@ -2097,7 +2097,7 @@ LSTATUS WINAPI RegGetValueW( HKEY hKey, LPCWSTR pszSubKey, LPCWSTR pszValue,
DWORD dwFlags, LPDWORD pdwType, PVOID pvData,
LPDWORD pcbData )
{
- DWORD dwType, cbData = pcbData ? *pcbData : 0;
+ DWORD dwType, cbData = (pvData && pcbData) ? *pcbData : 0;
PVOID pvBuf = NULL;
LONG ret;
@@ -2193,7 +2193,7 @@ LSTATUS WINAPI RegGetValueA( HKEY hKey, LPCSTR pszSubKey, LPCSTR pszValue,
DWORD dwFlags, LPDWORD pdwType, PVOID pvData,
LPDWORD pcbData )
{
- DWORD dwType, cbData = pcbData ? *pcbData : 0;
+ DWORD dwType, cbData = (pvData && pcbData) ? *pcbData : 0;
PVOID pvBuf = NULL;
LONG ret;
More information about the wine-cvs
mailing list