commit a971f54816e5c9fbe818019974fab3bf45d8bd53
author Francois Gouget <fgouget@codeweavers.com> Thu Nov 20 04:20:50 2003 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Nov 20 04:20:50 2003 +0000
tree 4f204b87e7f2e6ffd37c67cd7a820d0024ee22f4
parent d1b344b1e24c6f3958654d9f60c462cc3b3b5534

Don't use the data returned by RegQueryValueExW if it fails (found by
Valgrind).
A spelling fix.

dlls/shlwapi/reg.c

diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c
index 97f62dc..623620d 100644
--- a/dlls/shlwapi/reg.c
+++ b/dlls/shlwapi/reg.c
@@ -1240,6 +1240,8 @@
   if (pcbData) dwUnExpDataLen = *pcbData;
 
   dwRet = RegQueryValueExW(hKey, lpszValue, lpReserved, &dwType, pvData, &dwUnExpDataLen);
+  if (dwRet!=ERROR_SUCCESS && dwRet!=ERROR_MORE_DATA)
+      return dwRet;
 
   if (pcbData && (dwType == REG_EXPAND_SZ))
   {
@@ -1248,7 +1250,7 @@
     /* Expand type REG_EXPAND_SZ into REG_SZ */
     LPWSTR szData;
 
-    /* If the caller didn't supply a buffer or the buffer is to small we have
+    /* If the caller didn't supply a buffer or the buffer is too small we have
      * to allocate our own
      */
     if ((!pvData) || (dwRet == ERROR_MORE_DATA) )