Commit 40b15a38 authored by Christian Costa's avatar Christian Costa Committed by Alexandre Julliard

d3dxof: Make sure the returned object pointer is null when there is no more object.

parent 36d4e1ea
......@@ -988,17 +988,22 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE
if (This->nb_xobjects >= MAX_OBJECTS)
{
ERR("Too many objects\n");
*ppDataObj = NULL;
return DXFILEERR_NOMOREOBJECTS;
}
/* Check if there are templates defined before the object */
if (!parse_templates(&This->buf)) {
if (!parse_templates(&This->buf))
{
hr = DXFILEERR_BADVALUE;
goto error;
}
if (!This->buf.rem_bytes)
{
*ppDataObj = NULL;
return DXFILEERR_NOMOREOBJECTS;
}
hr = IDirectXFileDataImpl_Create(&object);
if (FAILED(hr))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment