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

[Alistair Leslie-Hughes]

Supersedes 166626.

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
---
 dlls/advapi32/registry.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c
index 9269898c6b..4f7f0ee7d5 100644
--- a/dlls/advapi32/registry.c
+++ b/dlls/advapi32/registry.c
@@ -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;
 
-- 
2.17.1

[Sven Baars]

On 17-06-19 00:38, Alistair Leslie-Hughes wrote:
> Supersedes 166626.
>
> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
> ---
>  dlls/advapi32/registry.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c
> index 9269898c6b..4f7f0ee7d5 100644
> --- a/dlls/advapi32/registry.c
> +++ b/dlls/advapi32/registry.c
> @@ -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;

Shouldn't you do this for both RegGetValueA and RegGetValueW?