[PATCH 0/1] MR9925: msado15: Fix IDBProperties use after free in adoconstruct_WrapDSOandSession.

[Piotr Caban (＠piotr)]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/9925

[PATCH 1/1] msado15: Fix IDBProperties use after free in adoconstruct_WrapDSOandSession.

[Piotr Caban]

From: Piotr Caban <[e-mail]>

---
 dlls/msado15/connection.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c
index 8de669c55a4..50345c6f725 100644
--- a/dlls/msado15/connection.c
+++ b/dlls/msado15/connection.c
@@ -992,7 +992,6 @@ static HRESULT WINAPI adoconstruct_WrapDSOandSession(ADOConnectionConstruction15
         if (connection->location != adUseClient)
             V_I4(&prop[1].vValue) &= ~DBPROPVAL_OS_CLIENTCURSOR;
         hr = IDBProperties_SetProperties( props, 1, &propset );
-        IDBProperties_Release( props );
         if (hr == DB_E_ERRORSOCCURRED || hr == DB_S_ERRORSOCCURRED)
         {
             DBPROPIDSET propidset;
@@ -1014,7 +1013,12 @@ static HRESULT WINAPI adoconstruct_WrapDSOandSession(ADOConnectionConstruction15
                 CoTaskMemFree( propset );
             }
         }
-        else if (FAILED(hr)) return hr;
+        else if (FAILED(hr))
+        {
+            IDBProperties_Release( props );
+            return hr;
+        }
+        IDBProperties_Release( props );
 
         hr = IUnknown_QueryInterface( dso, &IID_IDBInitialize, (void **)&dbinit );
         if (FAILED(hr)) return hr;
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/9925