Add global mutex / _libmsi_query_fetch fix

Author: caesay

msi-interop/database.c

@@ -124,15 +124,21 @@ MsiOpenDatabaseA(LPCSTR szDatabasePath, LPCSTR szPersist, MSIHANDLE *phDatabase)
         persist_path = szPersist;
     }
 
+    libmsi_global_lock();
+
     GError *error = NULL;
     LibmsiDatabase *db = libmsi_database_new(szDatabasePath, flags,
                                               persist_path, &error);
-    if (!db)
+    if (!db) {
+        libmsi_global_unlock();
         return gerror_to_msi(error);
+    }
 
     MSIHANDLE handle = handle_table_alloc(G_OBJECT(db), HANDLE_DATABASE);
     g_object_unref(db); /* handle_table_alloc added its own ref */
 
+    libmsi_global_unlock();
+
     if (handle == 0)
         return ERROR_GEN_FAILURE;
 
@@ -180,10 +186,14 @@ MsiDatabaseCommit(MSIHANDLE hDatabase)
     if (!db)
         return ERROR_INVALID_HANDLE;
 
+    libmsi_global_lock();
+
     GError *error = NULL;
     gboolean ok = libmsi_database_commit(db, &error);
     g_object_unref(db);
 
+    libmsi_global_unlock();
+
     if (!ok)
         return gerror_to_msi(error);
 
@@ -201,8 +211,11 @@ MsiGetDatabaseState(MSIHANDLE hDatabase)
     if (!db)
         return MSIDBSTATE_ERROR;
 
+    libmsi_global_lock();
     MSIDBSTATE ret = libmsi_database_is_readonly(db) ? MSIDBSTATE_READ : MSIDBSTATE_WRITE;
     g_object_unref(db);
+    libmsi_global_unlock();
+
     return ret;
 }
 
@@ -220,16 +233,22 @@ MsiDatabaseGetPrimaryKeysA(MSIHANDLE hDatabase, LPCSTR szTableName, MSIHANDLE *p
     if (!db)
         return ERROR_INVALID_HANDLE;
 
+    libmsi_global_lock();
+
     GError *error = NULL;
     LibmsiRecord *rec = libmsi_database_get_primary_keys(db, szTableName, &error);
     g_object_unref(db);
 
-    if (!rec)
+    if (!rec) {
+        libmsi_global_unlock();
         return gerror_to_msi(error);
+    }
 
     MSIHANDLE handle = handle_table_alloc(G_OBJECT(rec), HANDLE_RECORD);
     g_object_unref(rec);
 
+    libmsi_global_unlock();
+
     if (handle == 0)
         return ERROR_GEN_FAILURE;
 
@@ -266,10 +285,14 @@ MsiDatabaseIsTablePersistentA(MSIHANDLE hDatabase, LPCSTR szTableName)
     if (!db)
         return MSICONDITION_ERROR;
 
+    libmsi_global_lock();
+
     GError *error = NULL;
     gboolean persistent = libmsi_database_is_table_persistent(db, szTableName, &error);
     g_object_unref(db);
 
+    libmsi_global_unlock();
+
     if (error) {
         g_error_free(error);
         return MSICONDITION_ERROR;
@@ -310,11 +333,15 @@ MsiDatabaseImportA(MSIHANDLE hDatabase, LPCSTR szFolderPath, LPCSTR szFileName)
     /* Build full path: folder + separator + file */
     char *full_path = g_build_filename(szFolderPath, szFileName, NULL);
 
+    libmsi_global_lock();
+
     GError *error = NULL;
     gboolean ok = libmsi_database_import(db, full_path, &error);
     g_free(full_path);
     g_object_unref(db);
 
+    libmsi_global_unlock();
+
     if (!ok)
         return gerror_to_msi(error);
 
@@ -372,6 +399,8 @@ MsiDatabaseExportA(MSIHANDLE hDatabase, LPCSTR szTableName, LPCSTR szFolderPath,
         return ERROR_FUNCTION_FAILED;
     }
 
+    libmsi_global_lock();
+
     GError *error = NULL;
     gboolean ok = libmsi_database_export(db, szTableName, fd, &error);
 
@@ -383,6 +412,8 @@ MsiDatabaseExportA(MSIHANDLE hDatabase, LPCSTR szTableName, LPCSTR szFolderPath,
 
     g_object_unref(db);
 
+    libmsi_global_unlock();
+
     if (!ok)
         return gerror_to_msi(error);
 
@@ -431,11 +462,15 @@ MsiDatabaseMergeA(MSIHANDLE hDatabase, MSIHANDLE hDatabaseMerge, LPCSTR szTableN
         return ERROR_INVALID_HANDLE;
     }
 
+    libmsi_global_lock();
+
     GError *error = NULL;
     gboolean ok = libmsi_database_merge(db, db_merge, szTableName, &error);
     g_object_unref(db);
     g_object_unref(db_merge);
 
+    libmsi_global_unlock();
+
     if (!ok)
         return gerror_to_msi(error);
 
@@ -473,10 +508,14 @@ MsiDatabaseApplyTransformA(MSIHANDLE hDatabase, LPCSTR szTransformFile,
     if (!db)
         return ERROR_INVALID_HANDLE;
 
+    libmsi_global_lock();
+
     GError *error = NULL;
     gboolean ok = libmsi_database_apply_transform(db, szTransformFile, &error);
     g_object_unref(db);
 
+    libmsi_global_unlock();
+
     if (!ok)
         return gerror_to_msi(error);
 

msi-interop/handle_table.c

@@ -21,6 +21,36 @@ static guint free_list_count = 0;
 static GMutex table_mutex;
 static gboolean initialized = FALSE;
 
+/*
+ * Global recursive mutex that serializes ALL calls into libmsi and libgsf.
+ *
+ * Neither libmsi nor libgsf is thread-safe:
+ *  - Every public libmsi_* function does g_return_val_if_fail(LIBMSI_IS_*)
+ *    which exercises the GObject type system concurrently.
+ *  - libmsi_database_new calls g_object_new(LIBMSI_TYPE_DATABASE, ...) and
+ *    then opens OLE compound files via libgsf, which has no internal locking.
+ *  - Summary info, query, and record operations all touch shared database
+ *    state (string pools, table lists, streams) without synchronization.
+ *
+ * A single GRecMutex protects all libmsi/libgsf calls.  It must be recursive
+ * because our W-suffix functions call their A-suffix counterparts (e.g.
+ * MsiOpenDatabaseW -> MsiOpenDatabaseA), and MsiGetSummaryInformationA
+ * may internally call MsiOpenDatabaseA when hDatabase == 0.
+ */
+static GRecMutex libmsi_mutex;
+
+void
+libmsi_global_lock(void)
+{
+    g_rec_mutex_lock(&libmsi_mutex);
+}
+
+void
+libmsi_global_unlock(void)
+{
+    g_rec_mutex_unlock(&libmsi_mutex);
+}
+
 #define INITIAL_CAPACITY 64
 
 void

msi-interop/handle_table.h

@@ -31,4 +31,10 @@ unsigned int handle_table_close(MSIHANDLE handle);
 // Close all handles, unrefs all GObjects. Returns count of handles that were open.
 unsigned int handle_table_close_all(void);
 
+// Global recursive mutex protecting ALL calls into libmsi/libgsf.
+// Must be held around every libmsi API call to prevent concurrent access
+// to the non-thread-safe GObject type system and libgsf storage layer.
+void libmsi_global_lock(void);
+void libmsi_global_unlock(void);
+
 #endif