Module: wine Branch: master Commit: 5075f00f2590e95283d2c02fd1b391bd7aa59944 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5075f00f2590e95283d2c02fd1...
Author: Jacek Caban jacek@codeweavers.com Date: Thu Apr 22 21:36:08 2010 +0200
mshtml: Don't access url in translate_url after freeing it.
---
dlls/mshtml/nsio.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index c9bb54a..d55f169 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -196,16 +196,15 @@ static BOOL translate_url(HTMLDocumentObj *doc, nsWineURI *uri)
url = heap_strdupW(uri->wine_url); hres = IDocHostUIHandler_TranslateUrl(doc->hostui, 0, url, &new_url); - heap_free(url); - if(hres != S_OK || !new_url) - return FALSE; - - if(strcmpW(url, new_url)) { - FIXME("TranslateUrl returned new URL %s -> %s\n", debugstr_w(url), debugstr_w(new_url)); - ret = TRUE; + if(hres == S_OK && new_url) { + if(strcmpW(url, new_url)) { + FIXME("TranslateUrl returned new URL %s -> %s\n", debugstr_w(url), debugstr_w(new_url)); + ret = TRUE; + } + CoTaskMemFree(new_url); }
- CoTaskMemFree(new_url); + heap_free(url); return ret; }