Rob Shearman : mshtml: Use the correct deallocator in the htmldoc tests for the memory returned by IMoniker_GetDisplayName and fix a use-after-free error .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1c2827368648ef7ff5ecc785a4d84a6ee8628878
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1c2827368648ef7ff5ecc785a4...

Author: Rob Shearman 
Date:   Wed Dec  5 16:28:36 2007 +0000

mshtml: Use the correct deallocator in the htmldoc tests for the memory returned by IMoniker_GetDisplayName and fix a use-after-free error.

---

dlls/mshtml/tests/htmldoc.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c
index fe0d09d..ccfe05e 100644
--- a/dlls/mshtml/tests/htmldoc.c
+++ b/dlls/mshtml/tests/htmldoc.c
@@ -2506,7 +2506,7 @@ static void test_GetCurMoniker(IUnknown *unk, IMoniker *exmon, LPCWSTR exurl)
     IPersistMoniker_Release(permon);

if(exmon) {
-        BSTR url;
+        LPOLESTR url;
         BOOL exb = expect_GetDisplayName;
         BOOL clb = called_GetDisplayName;

@@ -2520,10 +2520,10 @@ static void test_GetCurMoniker(IUnknown *unk, IMoniker *exmon, LPCWSTR exurl)
         expect_GetDisplayName = exb;
         called_GetDisplayName = clb;

-        SysFreeString(url);
         ok(!lstrcmpW(url, doc_url), "url != doc_url\n");
+        CoTaskMemFree(url);
     }else if(exurl) {
-        BSTR url;
+        LPOLESTR url;

ok(hres == S_OK, "GetCurrentMoniker failed: %08x\n", hres);

@@ -2533,7 +2533,7 @@ static void test_GetCurMoniker(IUnknown *unk, IMoniker *exmon, LPCWSTR exurl)
         ok(!lstrcmpW(url, exurl), "unexpected url\n");
         ok(!lstrcmpW(url, doc_url), "url != doc_url\n");

-        SysFreeString(url);
+        CoTaskMemFree(url);
     }else {
         ok(hres == E_UNEXPECTED,
            "GetCurrentMoniker failed: %08x, expected E_UNEXPECTED\n", hres);