Detlef Riekenberg : setupapi: Avoid crash in SetupCloseInfFile.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Jul 10 08:02:33 CDT 2007
Module: wine
Branch: master
Commit: 8be4e8537c74a655ac535699eefe8c65a2f6445a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=8be4e8537c74a655ac535699eefe8c65a2f6445a
Author: Detlef Riekenberg <wine.dev at web.de>
Date: Mon Jul 9 19:31:23 2007 +0200
setupapi: Avoid crash in SetupCloseInfFile.
---
dlls/setupapi/parser.c | 2 +-
dlls/setupapi/tests/parser.c | 5 +++++
2 files changed, 6 insertions(+), 1 deletions(-)
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 @@ void WINAPI SetupCloseInfFile( HINF hinf )
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 );
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 @@ static void test_close_inf_file(void)
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"
More information about the wine-cvs
mailing list