commit 8be4e8537c74a655ac535699eefe8c65a2f6445a
author Detlef Riekenberg <wine.dev@web.de> Mon Jul 09 19:31:23 2007 +0200
committer Alexandre Julliard <julliard@winehq.org> Tue Jul 10 13:31:54 2007 +0200
tree 946d87f8a28235108c5ac3b0b97382bc9b94c08d
parent 9dedfd71e0211b46d58f1a0b17b1c3e8ca1eb0d7

setupapi: Avoid crash in SetupCloseInfFile.

dlls/setupapi/parser.c

diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c
index 6ddc1f2..ea410f8 100644
--- a/dlls/setupapi/parser.c
+++ b/dlls/setupapi/parser.c
@@ -1231,7 +1231,7 @@
     struct inf_file *file = hinf;
     unsigned int i;
 
-    if (!file) return;
+    if (!hinf || (hinf == INVALID_HANDLE_VALUE)) return;
 
     for (i = 0; i < file->nb_sections; i++) HeapFree( GetProcessHeap(), 0, file->sections[i] );
     HeapFree( GetProcessHeap(), 0, file->filename );

dlls/setupapi/tests/parser.c

diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c
index 2bb493e..2585f6d 100644
--- a/dlls/setupapi/tests/parser.c
+++ b/dlls/setupapi/tests/parser.c
@@ -405,6 +405,11 @@
     SetLastError(0xdeadbeef);
     SetupCloseInfFile(NULL);
     ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %u\n", GetLastError());
+
+    SetLastError(0xdeadbeef);
+    SetupCloseInfFile(INVALID_HANDLE_VALUE);
+    ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %u\n", GetLastError());
+
 }
 
 static const char *contents = "[Version]\n"