setupapi: Avoid memory leaks (coverity).

4d796458 · André Hentschel · Alexandre Julliard · a46bfd64 · 4d796458 · 4d796458
Commit 4d796458 authored Oct 28, 2012 by André Hentschel Committed by Alexandre Julliard Oct 29, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

install.c dlls/setupapi/install.c +1 -0

queue.c dlls/setupapi/queue.c +5 -1

No files found.
--- a/dlls/setupapi/install.c
+++ b/dlls/setupapi/install.c
@@ -1640,6 +1640,7 @@ BOOL WINAPI SetupGetInfFileListW(PCWSTR dir, DWORD style, PWSTR buffer,
                                  ( 2 + dir_len + name_len) * sizeof( WCHAR ));
            if( !fullname )
            {
+                FindClose( hdl );
                HeapFree( GetProcessHeap(), 0, filter );
                SetLastError( ERROR_NOT_ENOUGH_MEMORY );
                return FALSE;

--- a/dlls/setupapi/queue.c
+++ b/dlls/setupapi/queue.c
@@ -1156,7 +1156,11 @@ BOOL WINAPI SetupInstallFileExW( HINF hinf, PINFCONTEXT inf_context, PCWSTR sour
            SetLastError( ERROR_NOT_ENOUGH_MEMORY );
            return FALSE;
        }
-        if (!SetupGetStringFieldW( inf_context, 1, inf_source, len, NULL )) return FALSE;
+        if (!SetupGetStringFieldW( inf_context, 1, inf_source, len, NULL ))
+        {
+            HeapFree( GetProcessHeap(), 0, inf_source );
+            return FALSE;
+        }
        source = inf_source;
    }
    else if (!source)