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

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

This commit is contained in:
Jacek Caban 2012-10-19 11:58:15 +02:00 committed by Alexandre Julliard
parent 421368b875
commit b6227fc4e8
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
dlls/mshtml/navigate.c
View File

@ -215,7 +215,11 @@ static const nsIInputStreamVtbl nsInputStreamVtbl = {
static nsProtocolStream *create_nsprotocol_stream(void)
{
nsProtocolStream *ret = heap_alloc(sizeof(nsProtocolStream));
nsProtocolStream *ret;
ret = heap_alloc(sizeof(nsProtocolStream));
if(!ret)
return NULL;
ret->nsIInputStream_iface.lpVtbl = &nsInputStreamVtbl;
ret->ref = 1;
@ -877,8 +881,10 @@ static HRESULT BufferBSC_read_data(BSCallback *bsc, IStream *stream)
HRESULT hres;
if(!This->buf) {
This->buf = heap_alloc(128);
if(!This->buf)
return E_OUTOFMEMORY;
This->size = 128;
This->buf = heap_alloc(This->size);
}
do {
@ -921,23 +927,20 @@ static const BSCallbackVtbl BufferBSCVtbl = {
};
static BufferBSC *create_bufferbsc(IMoniker *mon)
{
BufferBSC *ret = heap_alloc_zero(sizeof(*ret));
init_bscallback(&ret->bsc, &BufferBSCVtbl, mon, 0);
ret->hres = E_FAIL;
return ret;
}
HRESULT bind_mon_to_wstr(HTMLInnerWindow *window, IMoniker *mon, WCHAR **ret)
{
BufferBSC *bsc = create_bufferbsc(mon);
BufferBSC *bsc;
int cp = CP_ACP;
WCHAR *text;
HRESULT hres;
bsc = heap_alloc_zero(sizeof(*bsc));
if(!bsc)
return E_OUTOFMEMORY;
init_bscallback(&bsc->bsc, &BufferBSCVtbl, mon, 0);
bsc->hres = E_FAIL;
hres = start_binding(window, &bsc->bsc, NULL);
if(SUCCEEDED(hres))
hres = bsc->hres;
@ -1164,8 +1167,11 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream)
return S_OK;
}
if(!This->nsstream)
if(!This->nsstream) {
This->nsstream = create_nsprotocol_stream();
if(!This->nsstream)
return E_OUTOFMEMORY;
}
do {
BOOL first_read = !This->bsc.readed;