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

quartz: Don't crash in SetMediaType if the source media type is NULL.

Browse Source
This commit is contained in:
Juan Lang 2010-12-02 09:23:38 -08:00 committed by Alexandre Julliard
parent 4a9d2d43fe
commit a273ce077e
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/quartz/memallocator.c
View File

@ -661,8 +661,13 @@ static HRESULT WINAPI StdMediaSample2_SetMediaType(IMediaSample2 * iface, AM_MED
TRACE("(%p)->(%p)\n", iface, pMediaType); TRACE("(%p)->(%p)\n", iface, pMediaType);
if (This->props.pMediaType) if (This->props.pMediaType)
{
FreeMediaType(This->props.pMediaType); FreeMediaType(This->props.pMediaType);
else if (!(This->props.pMediaType = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)))) This->props.pMediaType = NULL;
}
if (!pMediaType)
return S_FALSE;
if (!(This->props.pMediaType = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE))))
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
return CopyMediaType(This->props.pMediaType, pMediaType); return CopyMediaType(This->props.pMediaType, pMediaType);