Dmitry Timoshkov : adsldp/tests: Fix memory leaks (Valgrind).

Alexandre Julliard julliard at winehq.org
Fri Apr 17 16:12:57 CDT 2020


Module: wine
Branch: master
Commit: e521fe032730c6aa41d20017e9a20c1ec8bcf364
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=e521fe032730c6aa41d20017e9a20c1ec8bcf364

Author: Dmitry Timoshkov <dmitry at baikal.ru>
Date:   Fri Apr 17 17:12:15 2020 +0800

adsldp/tests: Fix memory leaks (Valgrind).

Signed-off-by: Dmitry Timoshkov <dmitry at baikal.ru>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/adsldp/tests/ldap.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c
index 01a3aec90e..fe9801a397 100644
--- a/dlls/adsldp/tests/ldap.c
+++ b/dlls/adsldp/tests/ldap.c
@@ -235,8 +235,12 @@ static void do_search(const struct search *s)
     trace("search DN %s\n", wine_dbgstr_w(s->dn));
 
     hr = ADsGetObject(s->dn, &IID_IDirectorySearch, (void **)&ds);
+    if (hr == HRESULT_FROM_WIN32(ERROR_DS_SERVER_DOWN))
+    {
+        skip("server is down\n");
+        return;
+    }
     ok(hr == S_OK, "got %#x\n", hr);
-    if (hr != S_OK) return;
 
     pref.dwSearchPref = ADS_SEARCHPREF_SEARCH_SCOPE;
     pref.vValue.dwType = ADSTYPE_INTEGER;
@@ -282,6 +286,7 @@ static void do_search(const struct search *s)
 
             ok(!res->values[i], "expected extra value %s\n", wine_dbgstr_w(res->values[i]));
 
+            IDirectorySearch_FreeColumn(ds, &col);
             FreeADsMem(name);
             res++;
         }
@@ -485,6 +490,7 @@ static void test_DirectoryObject(void)
     hr = IDirectoryObject_QueryInterface(dirobj, &IID_IADsOpenDSObject, (void **)&unk);
 todo_wine
     ok(hr == E_NOINTERFACE, "got %#x\n", hr);
+    if (hr == S_OK) IUnknown_Release(unk);
     hr = IDirectoryObject_QueryInterface(dirobj, &IID_IDispatch, (void **)&unk);
     ok(hr == S_OK, "got %#x\n", hr);
     IUnknown_Release(unk);




More information about the wine-cvs mailing list