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

d3dxof: Checkout output pointer and set returned interface to NULL at the beginning.

This commit is contained in:
Christian Costa 2012-09-16 20:23:33 +02:00 committed by Alexandre Julliard
parent d8d58b238c
commit 87d7fe68e2
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dlls/d3dxof/d3dxof.c
View File

@ -987,27 +987,25 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE
IDirectXFileDataImpl* object; IDirectXFileDataImpl* object;
HRESULT hr; HRESULT hr;
if (!ppDataObj)
return E_POINTER;
*ppDataObj = NULL;
TRACE("(%p/%p)->(%p)\n", This, iface, ppDataObj); TRACE("(%p/%p)->(%p)\n", This, iface, ppDataObj);
if (This->nb_xobjects >= MAX_OBJECTS) if (This->nb_xobjects >= MAX_OBJECTS)
{ {
ERR("Too many objects\n"); ERR("Too many objects\n");
*ppDataObj = NULL;
return DXFILEERR_NOMOREOBJECTS; return DXFILEERR_NOMOREOBJECTS;
} }
/* Check if there are templates defined before the object */ /* Check if there are templates defined before the object */
if (!parse_templates(&This->buf)) if (!parse_templates(&This->buf))
{
*ppDataObj = NULL;
return DXFILEERR_BADVALUE; return DXFILEERR_BADVALUE;
}
if (!This->buf.rem_bytes) if (!This->buf.rem_bytes)
{
*ppDataObj = NULL;
return DXFILEERR_NOMOREOBJECTS; return DXFILEERR_NOMOREOBJECTS;
}
hr = IDirectXFileDataImpl_Create(&object); hr = IDirectXFileDataImpl_Create(&object);
if (FAILED(hr)) if (FAILED(hr))
@ -1064,7 +1062,6 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE
error: error:
IDirectXFileData_Release(&object->IDirectXFileData_iface); IDirectXFileData_Release(&object->IDirectXFileData_iface);
*ppDataObj = NULL;
return hr; return hr;
} }