- make sure to free the string table when closing the database

- don't free szPersist in MsiOpenDatabase if it's not a string

- make sure to free the string table when closing the database
c1f2cf1f · Mike McCormack · Alexandre Julliard · 809cf354 · c1f2cf1f
Commit c1f2cf1f authored May 10, 2005 by Mike McCormack Committed by Alexandre Julliard May 10, 2005
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

database.c dlls/msi/database.c +3 -1

No files found.
--- a/dlls/msi/database.c
+++ b/dlls/msi/database.c
@@ -65,6 +65,7 @@ VOID MSI_CloseDatabase( MSIOBJECTHDR *arg )
    DWORD r;

    free_cached_tables( db );
+    msi_destroy_stringtable( db->strings );
    r = IStorage_Release( db->storage );
    if( r )
        ERR("database reference count was not zero (%ld)\n", r);
@@ -213,7 +214,8 @@ UINT WINAPI MsiOpenDatabaseA(LPCSTR szDBPath, LPCSTR szPersist, MSIHANDLE *phDB)
    r = MsiOpenDatabaseW( szwDBPath, szwPersist, phDB );

 end:
-    HeapFree( GetProcessHeap(), 0, szwPersist );
+    if( HIWORD(szPersist) )
+        HeapFree( GetProcessHeap(), 0, szwPersist );
    HeapFree( GetProcessHeap(), 0, szwDBPath );

    return r;