[PATCH 2/6] msi: Avoid a null pointer dereference.
Zebediah Figura
z.figura12 at gmail.com
Thu Jul 20 23:43:11 CDT 2017
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
dlls/msi/database.c | 5 +++++
dlls/msi/tests/db.c | 6 ++++++
2 files changed, 11 insertions(+)
diff --git a/dlls/msi/database.c b/dlls/msi/database.c
index 34f8d04..85e8306 100644
--- a/dlls/msi/database.c
+++ b/dlls/msi/database.c
@@ -778,6 +778,11 @@ static UINT MSI_DatabaseImport(MSIDATABASE *db, LPCWSTR folder, LPCWSTR file)
lstrcatW( path, file );
data = msi_read_text_archive( path, &len );
+ if (!data)
+ {
+ msi_free(path);
+ return ERROR_FUNCTION_FAILED;
+ }
ptr = data;
msi_parse_line( &ptr, &columns, &num_columns, &len );
diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c
index 278b45f..4ea1f10 100644
--- a/dlls/msi/tests/db.c
+++ b/dlls/msi/tests/db.c
@@ -2369,6 +2369,12 @@ static void test_msiimport(void)
r = MsiOpenDatabaseW(msifileW, MSIDBOPEN_CREATE, &hdb);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
+ r = MsiDatabaseImportA(hdb, CURR_DIR, NULL);
+ ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
+
+ r = MsiDatabaseImportA(hdb, CURR_DIR, "nonexistent");
+ ok(r == ERROR_FUNCTION_FAILED, "Expected ERROR_FUNCTION_FAILED, got %d\n", r);
+
r = add_table_to_db(hdb, test_data);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
--
2.7.4
More information about the wine-patches
mailing list