[PATCH v2] advapi32: Dont read a value that might be uninitialized. (Coverity)

[Alistair Leslie-Hughes]

Supersedes 166626.

Signed-off-by: Alistair Leslie-Hughes 
---
 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 9269898c6b..2d2c1be4dc 100644
--- a/dlls/advapi32/registry.c
+++ b/dlls/advapi32/registry.c
@@ -2118,7 +2118,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;

@@ -2214,7 +2214,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;