Dmitry Timoshkov : mshtml: Handle memory allocation failure when creating IOleUndoManager.

[Alexandre Julliard]

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

Author: Dmitry Timoshkov <dmitry(a)baikal.ru>
Date:   Mon Oct 12 11:21:20 2015 +0800

mshtml: Handle memory allocation failure when creating IOleUndoManager.

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/mshtml/service.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dlls/mshtml/service.c b/dlls/mshtml/service.c
index 56744e6..8b2a6b7 100644
--- a/dlls/mshtml/service.c
+++ b/dlls/mshtml/service.c
@@ -197,6 +197,8 @@ static IOleUndoManager *create_undomgr(void)
 {
     UndoManager *ret = heap_alloc(sizeof(UndoManager));
 
+    if (!ret) return NULL;
+
     ret->IOleUndoManager_iface.lpVtbl = &OleUndoManagerVtbl;
     ret->ref = 1;
 
@@ -246,6 +248,9 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFG
         if(!This->doc_obj->undomgr)
             This->doc_obj->undomgr = create_undomgr();
 
+        if (!This->doc_obj->undomgr)
+            return E_OUTOFMEMORY;
+
         return IOleUndoManager_QueryInterface(This->doc_obj->undomgr, riid, ppv);
     }