ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Check if event_table entry is allocated before using it in remove_event_handler.

This commit is contained in:
Jacek Caban 2010-06-19 22:25:32 +02:00 committed by Alexandre Julliard
parent c00121a603
commit 1eced6053d
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/mshtml/htmlevent.c
View File

@ -1077,7 +1077,7 @@ static HRESULT ensure_nsevent_handler(HTMLDocumentNode *doc, event_target_t *eve
static HRESULT remove_event_handler(event_target_t **event_target, eventid_t eid) static HRESULT remove_event_handler(event_target_t **event_target, eventid_t eid)
{ {
if(*event_target && (*event_target)->event_table[eid]->handler_prop) { if(*event_target && (*event_target)->event_table[eid] && (*event_target)->event_table[eid]->handler_prop) {
IDispatch_Release((*event_target)->event_table[eid]->handler_prop); IDispatch_Release((*event_target)->event_table[eid]->handler_prop);
(*event_target)->event_table[eid]->handler_prop = NULL; (*event_target)->event_table[eid]->handler_prop = NULL;
} }

4
dlls/mshtml/tests/events.c
View File

@ -1172,6 +1172,10 @@ static void test_onclick(IHTMLDocument2 *doc)
hres = IHTMLElement_put_onclick(div, v); hres = IHTMLElement_put_onclick(div, v);
ok(hres == S_OK, "put_onclick failed: %08x\n", hres); ok(hres == S_OK, "put_onclick failed: %08x\n", hres);
V_VT(&v) = VT_NULL;
hres = IHTMLElement_put_ondblclick(div, v);
ok(hres == S_OK, "put_ondblclick failed: %08x\n", hres);
V_VT(&v) = VT_EMPTY; V_VT(&v) = VT_EMPTY;
hres = IHTMLElement_get_onclick(div, &v); hres = IHTMLElement_get_onclick(div, &v);
ok(hres == S_OK, "get_onclick failed: %08x\n", hres); ok(hres == S_OK, "get_onclick failed: %08x\n", hres);