Marcus Meissner : shell32: Check error return in get_known_folder_path ( Coverity).

Alexandre Julliard julliard at winehq.org
Thu Jul 14 13:08:14 CDT 2011


Module: wine
Branch: master
Commit: a05ba2b9de7dcbc454f9d04cf1b3df4dffea57a6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a05ba2b9de7dcbc454f9d04cf1b3df4dffea57a6

Author: Marcus Meissner <marcus at jet.franken.de>
Date:   Thu Jul 14 08:45:00 2011 +0200

shell32: Check error return in get_known_folder_path (Coverity).

---

 dlls/shell32/shellpath.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c
index 58e2006..4b14739 100644
--- a/dlls/shell32/shellpath.c
+++ b/dlls/shell32/shellpath.c
@@ -3422,9 +3422,14 @@ static HRESULT get_known_folder_path(
     if(hr == S_OK)
     {
         /* get parent's known folder path (recursive) */
-        get_known_folder_registry_path(NULL, parentGuid, &parentRegistryPath);
+        hr = get_known_folder_registry_path(NULL, parentGuid, &parentRegistryPath);
+        if(!SUCCEEDED(hr)) return hr;
 
         hr = get_known_folder_path(parentGuid, parentRegistryPath, &parentPath);
+        if(!SUCCEEDED(hr)) {
+            HeapFree(GetProcessHeap(), 0, parentRegistryPath);
+            return hr;
+        }
 
         lstrcatW(path, parentPath);
         lstrcatW(path, sBackslash);




More information about the wine-cvs mailing list