system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 12:19:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

mshtml: Properly handle OOM errors in task.c (coverity).

Browse source
This commit is contained in:
Jacek Caban 2012-10-19 11:56:59 +02:00 committed by Alexandre Julliard
parent baf2ac6fbe
commit 08485aeb48
6 changed files with 62 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
dlls/mshtml/htmlwindow.c
View file

@ -1544,6 +1544,7 @@ static HRESULT window_set_timer(HTMLInnerWindow *This, VARIANT *expr, LONG msec,
BOOL interval, LONG *timer_id)
{
IDispatch *disp = NULL;
HRESULT hres;
switch(V_VT(expr)) {
case VT_DISPATCH:
@ -1563,10 +1564,10 @@ static HRESULT window_set_timer(HTMLInnerWindow *This, VARIANT *expr, LONG msec,
if(!disp)
return E_FAIL;
*timer_id = set_task_timer(This, msec, interval, disp);
hres = set_task_timer(This, msec, interval, disp, timer_id);
IDispatch_Release(disp);
return S_OK;
return hres;
}
static HRESULT WINAPI HTMLWindow3_setTimeout(IHTMLWindow3 *iface, VARIANT *expression, LONG msec,

4
dlls/mshtml/mshtml_private.h
View file

@ -977,10 +977,10 @@ thread_data_t *get_thread_data(BOOL) DECLSPEC_HIDDEN;
HWND get_thread_hwnd(void) DECLSPEC_HIDDEN;
LONG get_task_target_magic(void) DECLSPEC_HIDDEN;
void push_task(task_t*,task_proc_t,task_proc_t,LONG) DECLSPEC_HIDDEN;
HRESULT push_task(task_t*,task_proc_t,task_proc_t,LONG) DECLSPEC_HIDDEN;
void remove_target_tasks(LONG) DECLSPEC_HIDDEN;
DWORD set_task_timer(HTMLInnerWindow*,DWORD,BOOL,IDispatch*) DECLSPEC_HIDDEN;
HRESULT set_task_timer(HTMLInnerWindow*,DWORD,BOOL,IDispatch*,LONG*) DECLSPEC_HIDDEN;
HRESULT clear_task_timer(HTMLInnerWindow*,BOOL,DWORD) DECLSPEC_HIDDEN;
const char *debugstr_variant(const VARIANT*) DECLSPEC_HIDDEN;

13
dlls/mshtml/navigate.c
View file

@ -1437,8 +1437,7 @@ static HRESULT async_stop_request(nsChannelBSC *This)
IBindStatusCallback_AddRef(&This->bsc.IBindStatusCallback_iface);
task->bsc = This;
push_task(&task->header, stop_request_proc, stop_request_task_destr, This->bsc.window->task_magic);
return S_OK;
return push_task(&task->header, stop_request_proc, stop_request_task_destr, This->bsc.window->task_magic);
}
static void handle_navigation_error(nsChannelBSC *This, DWORD result)
@ -1798,8 +1797,7 @@ HRESULT async_start_doc_binding(HTMLOuterWindow *window, HTMLInnerWindow *pendin
task->pending_window = pending_window;
IHTMLWindow2_AddRef(&pending_window->base.IHTMLWindow2_iface);
push_task(&task->header, start_doc_binding_proc, start_doc_binding_task_destr, pending_window->task_magic);
return S_OK;
return push_task(&task->header, start_doc_binding_proc, start_doc_binding_task_destr, pending_window->task_magic);
}
void abort_window_bindings(HTMLInnerWindow *window)
@ -2105,8 +2103,7 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, const WCHAR *headers,
task->window = window;
task->bscallback = bsc;
task->mon = mon;
push_task(&task->header, navigate_proc, navigate_task_destr, window->task_magic);
hres = push_task(&task->header, navigate_proc, navigate_task_destr, window->task_magic);
}else {
navigate_javascript_task_t *task;
@ -2124,10 +2121,10 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, const WCHAR *headers,
IUri_AddRef(uri);
task->window = window;
task->uri = uri;
push_task(&task->header, navigate_javascript_proc, navigate_javascript_task_destr, window->task_magic);
hres = push_task(&task->header, navigate_javascript_proc, navigate_javascript_task_destr, window->task_magic);
}
return S_OK;
return hres;
}
HRESULT navigate_new_window(HTMLOuterWindow *window, IUri *uri, const WCHAR *name, IHTMLWindow2 **ret)

4
dlls/mshtml/nsio.c
View file

@ -1013,7 +1013,9 @@ static nsresult async_open(nsChannel *This, HTMLOuterWindow *window, BOOL is_doc
task->window = window->base.inner_window;
task->bscallback = bscallback;
push_task(&task->header, start_binding_proc, start_binding_task_destr, window->base.inner_window->task_magic);
hres = push_task(&task->header, start_binding_proc, start_binding_task_destr, window->base.inner_window->task_magic);
if(FAILED(hres))
return NS_ERROR_OUT_OF_MEMORY;
}
return NS_OK;

10
dlls/mshtml/persist.c
View file

@ -388,16 +388,18 @@ HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, nsChannel
task = heap_alloc(sizeof(docobj_task_t));
task->doc = This->doc_obj;
push_task(&task->header, set_progress_proc, NULL, This->doc_obj->basedoc.task_magic);
hres = push_task(&task->header, set_progress_proc, NULL, This->doc_obj->basedoc.task_magic);
if(FAILED(hres)) {
CoTaskMemFree(url);
return hres;
}
}
download_task = heap_alloc(sizeof(download_proc_task_t));
download_task->doc = This->doc_obj;
download_task->set_download = set_download;
download_task->url = url;
push_task(&download_task->header, set_downloading_proc, set_downloading_task_destr, This->doc_obj->basedoc.task_magic);
return S_OK;
return push_task(&download_task->header, set_downloading_proc, set_downloading_task_destr, This->doc_obj->basedoc.task_magic);
}
void set_ready_state(HTMLOuterWindow *window, READYSTATE readystate)

52
dlls/mshtml/task.c
View file

@ -20,6 +20,7 @@
#include <stdarg.h>
#include <stdio.h>
#include <assert.h>
#define COBJMACROS
@ -52,9 +53,18 @@ static void default_task_destr(task_t *task)
heap_free(task);
}
void push_task(task_t *task, task_proc_t proc, task_proc_t destr, LONG magic)
HRESULT push_task(task_t *task, task_proc_t proc, task_proc_t destr, LONG magic)
{
thread_data_t *thread_data = get_thread_data(TRUE);
thread_data_t *thread_data;
thread_data = get_thread_data(TRUE);
if(!thread_data) {
if(destr)
destr(task);
else
heap_free(task);
return E_OUTOFMEMORY;
}
task->target_magic = magic;
task->proc = proc;
@ -69,13 +79,19 @@ void push_task(task_t *task, task_proc_t proc, task_proc_t destr, LONG magic)
thread_data->task_queue_tail = task;
PostMessageW(thread_data->thread_hwnd, WM_PROCESSTASK, 0, 0);
return S_OK;
}
static task_t *pop_task(void)
{
thread_data_t *thread_data = get_thread_data(TRUE);
task_t *task = thread_data->task_queue_head;
thread_data_t *thread_data;
task_t *task;
thread_data = get_thread_data(FALSE);
if(!thread_data)
return NULL;
task = thread_data->task_queue_head;
if(!task)
return NULL;
@ -163,15 +179,22 @@ static BOOL queue_timer(thread_data_t *thread_data, task_timer_t *timer)
return FALSE;
}
DWORD set_task_timer(HTMLInnerWindow *window, DWORD msec, BOOL interval, IDispatch *disp)
HRESULT set_task_timer(HTMLInnerWindow *window, DWORD msec, BOOL interval, IDispatch *disp, LONG *id)
{
thread_data_t *thread_data = get_thread_data(TRUE);
thread_data_t *thread_data;
task_timer_t *timer;
DWORD tc = GetTickCount();
static DWORD id_cnt = 0x20000000;
thread_data = get_thread_data(TRUE);
if(!thread_data)
return E_OUTOFMEMORY;
timer = heap_alloc(sizeof(task_timer_t));
if(!timer)
return E_OUTOFMEMORY;
timer->id = id_cnt++;
timer->window = window;
timer->time = tc + msec;
@ -184,7 +207,8 @@ DWORD set_task_timer(HTMLInnerWindow *window, DWORD msec, BOOL interval, IDispat
if(queue_timer(thread_data, timer))
SetTimer(thread_data->thread_hwnd, TIMER_ID, msec, NULL);
return timer->id;
*id = timer->id;
return S_OK;
}
HRESULT clear_task_timer(HTMLInnerWindow *window, BOOL interval, DWORD id)
@ -228,13 +252,16 @@ static void call_timer_disp(IDispatch *disp)
static LRESULT process_timer(void)
{
thread_data_t *thread_data = get_thread_data(TRUE);
thread_data_t *thread_data;
IDispatch *disp;
DWORD tc;
task_timer_t *timer;
TRACE("\n");
thread_data = get_thread_data(FALSE);
assert(thread_data != NULL);
while(!list_empty(&thread_data->timer_list)) {
timer = LIST_ENTRY(list_head(&thread_data->timer_list), task_timer_t, entry);
@ -311,7 +338,11 @@ static HWND create_thread_hwnd(void)
HWND get_thread_hwnd(void)
{
thread_data_t *thread_data = get_thread_data(TRUE);
thread_data_t *thread_data;
thread_data = get_thread_data(TRUE);
if(!thread_data)
return NULL;
if(!thread_data->thread_hwnd)
thread_data->thread_hwnd = create_thread_hwnd();
@ -341,6 +372,9 @@ thread_data_t *get_thread_data(BOOL create)
thread_data = TlsGetValue(mshtml_tls);
if(!thread_data && create) {
thread_data = heap_alloc_zero(sizeof(thread_data_t));
if(!thread_data)
return NULL;
TlsSetValue(mshtml_tls, thread_data);
list_init(&thread_data->timer_list);
}