Better ref counting

Author: caesay

msi-interop/database.c

@@ -181,7 +181,10 @@ MsiDatabaseCommit(MSIHANDLE hDatabase)
         return ERROR_INVALID_HANDLE;
 
     GError *error = NULL;
-    if (!libmsi_database_commit(db, &error))
+    gboolean ok = libmsi_database_commit(db, &error);
+    g_object_unref(db);
+
+    if (!ok)
         return gerror_to_msi(error);
 
     return ERROR_SUCCESS;
@@ -198,10 +201,9 @@ MsiGetDatabaseState(MSIHANDLE hDatabase)
     if (!db)
         return MSIDBSTATE_ERROR;
 
-    if (libmsi_database_is_readonly(db))
-        return MSIDBSTATE_READ;
-
-    return MSIDBSTATE_WRITE;
+    MSIDBSTATE ret = libmsi_database_is_readonly(db) ? MSIDBSTATE_READ : MSIDBSTATE_WRITE;
+    g_object_unref(db);
+    return ret;
 }
 
 /* -------------------------------------------------------------------------- */
@@ -220,6 +222,8 @@ MsiDatabaseGetPrimaryKeysA(MSIHANDLE hDatabase, LPCSTR szTableName, MSIHANDLE *p
 
     GError *error = NULL;
     LibmsiRecord *rec = libmsi_database_get_primary_keys(db, szTableName, &error);
+    g_object_unref(db);
+
     if (!rec)
         return gerror_to_msi(error);
 
@@ -264,6 +268,8 @@ MsiDatabaseIsTablePersistentA(MSIHANDLE hDatabase, LPCSTR szTableName)
 
     GError *error = NULL;
     gboolean persistent = libmsi_database_is_table_persistent(db, szTableName, &error);
+    g_object_unref(db);
+
     if (error) {
         g_error_free(error);
         return MSICONDITION_ERROR;
@@ -307,6 +313,7 @@ MsiDatabaseImportA(MSIHANDLE hDatabase, LPCSTR szFolderPath, LPCSTR szFileName)
     GError *error = NULL;
     gboolean ok = libmsi_database_import(db, full_path, &error);
     g_free(full_path);
+    g_object_unref(db);
 
     if (!ok)
         return gerror_to_msi(error);
@@ -360,8 +367,10 @@ MsiDatabaseExportA(MSIHANDLE hDatabase, LPCSTR szTableName, LPCSTR szFolderPath,
 #endif
     g_free(full_path);
 
-    if (fd < 0)
+    if (fd < 0) {
+        g_object_unref(db);
         return ERROR_FUNCTION_FAILED;
+    }
 
     GError *error = NULL;
     gboolean ok = libmsi_database_export(db, szTableName, fd, &error);
@@ -372,6 +381,8 @@ MsiDatabaseExportA(MSIHANDLE hDatabase, LPCSTR szTableName, LPCSTR szFolderPath,
     close(fd);
 #endif
 
+    g_object_unref(db);
+
     if (!ok)
         return gerror_to_msi(error);
 
@@ -415,11 +426,17 @@ MsiDatabaseMergeA(MSIHANDLE hDatabase, MSIHANDLE hDatabaseMerge, LPCSTR szTableN
         return ERROR_INVALID_HANDLE;
 
     LibmsiDatabase *db_merge = (LibmsiDatabase *)handle_table_get_typed(hDatabaseMerge, HANDLE_DATABASE);
-    if (!db_merge)
+    if (!db_merge) {
+        g_object_unref(db);
         return ERROR_INVALID_HANDLE;
+    }
 
     GError *error = NULL;
-    if (!libmsi_database_merge(db, db_merge, szTableName, &error))
+    gboolean ok = libmsi_database_merge(db, db_merge, szTableName, &error);
+    g_object_unref(db);
+    g_object_unref(db_merge);
+
+    if (!ok)
         return gerror_to_msi(error);
 
     return ERROR_SUCCESS;
@@ -457,7 +474,10 @@ MsiDatabaseApplyTransformA(MSIHANDLE hDatabase, LPCSTR szTransformFile,
         return ERROR_INVALID_HANDLE;
 
     GError *error = NULL;
-    if (!libmsi_database_apply_transform(db, szTransformFile, &error))
+    gboolean ok = libmsi_database_apply_transform(db, szTransformFile, &error);
+    g_object_unref(db);
+
+    if (!ok)
         return gerror_to_msi(error);
 
     return ERROR_SUCCESS;

msi-interop/handle_table.c

@@ -129,6 +129,7 @@ handle_table_get(MSIHANDLE handle)
     }
 
     GObject *obj = slots[index].obj;
+    g_object_ref(obj);
 
     g_mutex_unlock(&table_mutex);
 
@@ -156,6 +157,7 @@ handle_table_get_typed(MSIHANDLE handle, HandleType type)
     }
 
     GObject *obj = slots[index].obj;
+    g_object_ref(obj);
 
     g_mutex_unlock(&table_mutex);
 

msi-interop/handle_table.h

@@ -19,10 +19,10 @@ void handle_table_init(void);
 // Allocate a handle for a GObject, adds a ref. Returns 0 on failure.
 MSIHANDLE handle_table_alloc(GObject *obj, HandleType type);
 
-// Get the GObject for a handle. Does NOT add a ref. Returns NULL if invalid.
+// Get the GObject for a handle. Adds a ref; caller must g_object_unref(). Returns NULL if invalid.
 GObject *handle_table_get(MSIHANDLE handle);
 
-// Get the GObject for a handle with type check. Returns NULL if invalid or wrong type.
+// Get the GObject for a handle with type check. Adds a ref; caller must g_object_unref(). Returns NULL if invalid or wrong type.
 GObject *handle_table_get_typed(MSIHANDLE handle, HandleType type);
 
 // Close a handle, unrefs the GObject. Returns 0 on success, non-zero on error.