From e8b9bda53ac39c913ddc93de0308f0c8b69605fc Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Mon, 12 Oct 2015 11:21:20 +0800 Subject: [PATCH] mshtml: Handle memory allocation failure when creating IOleUndoManager. Signed-off-by: Dmitry Timoshkov Signed-off-by: Jacek Caban Signed-off-by: Alexandre Julliard --- dlls/mshtml/service.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/mshtml/service.c b/dlls/mshtml/service.c index 56744e6d440..8b2a6b7b648 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); } -- 2.11.4.GIT