msctf: Allocate memory only right before it's needed.

Fixes a memory leak on an error path. Found by Smatch.

msctf: Allocate memory only right before it's needed.
850f6c79 · Michael Stefaniuc · Alexandre Julliard · d39dd383 · 850f6c79
Commit 850f6c79 authored May 16, 2009 by Michael Stefaniuc Committed by Alexandre Julliard May 18, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 8 deletions

msctf.c dlls/msctf/msctf.c +8 -8

No files found.
--- a/dlls/msctf/msctf.c
+++ b/dlls/msctf/msctf.c
@@ -358,14 +358,6 @@ HRESULT add_active_textservice(TF_LANGUAGEPROFILE *lp)
    actsvr = HeapAlloc(GetProcessHeap(),0,sizeof(ActivatedTextService));
    if (!actsvr) return E_OUTOFMEMORY;

-    entry = HeapAlloc(GetProcessHeap(),0,sizeof(AtsEntry));
-
-    if (!entry)
-    {
-        HeapFree(GetProcessHeap(),0,actsvr);
-        return E_OUTOFMEMORY;
-    }
-
    ITfThreadMgr_QueryInterface(tm,&IID_ITfClientId,(LPVOID)&clientid);
    ITfClientId_GetClientId(clientid, &lp->clsid, &actsvr->tid);
    ITfClientId_Release(clientid);
@@ -404,6 +396,14 @@ HRESULT add_active_textservice(TF_LANGUAGEPROFILE *lp)
    if (activated > 0)
        activate_given_ts(actsvr, tm);

+    entry = HeapAlloc(GetProcessHeap(),0,sizeof(AtsEntry));
+
+    if (!entry)
+    {
+        HeapFree(GetProcessHeap(),0,actsvr);
+        return E_OUTOFMEMORY;
+    }
+
    entry->ats = actsvr;
    list_add_head(&AtsList, &entry->entry);