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

quartz: Check against a null dereference and don't read beyond the end of file.

This commit is contained in:
Maarten Lankhorst 2008-03-28 13:10:20 -07:00 committed by Alexandre Julliard
parent ae1791b0b8
commit 714e807aa5
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/quartz/mpegsplit.c
View File

@ -370,9 +370,13 @@ fail:
FIXME("Failed with hres: %08x!\n", hr); FIXME("Failed with hres: %08x!\n", hr);
This->skipbytes += This->remaining_bytes; This->skipbytes += This->remaining_bytes;
This->remaining_bytes = 0; This->remaining_bytes = 0;
if (This->pCurrentSample)
{
IMediaSample_SetActualDataLength(This->pCurrentSample, 0);
IMediaSample_Release(This->pCurrentSample); IMediaSample_Release(This->pCurrentSample);
This->pCurrentSample = NULL; This->pCurrentSample = NULL;
} }
}
if (BYTES_FROM_MEDIATIME(tStop) >= This->EndOfFile) if (BYTES_FROM_MEDIATIME(tStop) >= This->EndOfFile)
{ {
@ -647,6 +651,7 @@ static HRESULT MPEGSplitter_pre_connect(IPin *iface, IPin *pConnectPin)
while (pos < This->EndOfFile && SUCCEEDED(hr)) while (pos < This->EndOfFile && SUCCEEDED(hr))
{ {
LONGLONG length = 0; LONGLONG length = 0;
hr = IAsyncReader_SyncRead(pPin->pReader, pos, 4, header);
while (parse_header(header, &length, &duration)) while (parse_header(header, &length, &duration))
{ {
/* No valid header yet; shift by a byte and check again */ /* No valid header yet; shift by a byte and check again */
@ -655,11 +660,8 @@ static HRESULT MPEGSplitter_pre_connect(IPin *iface, IPin *pConnectPin)
if (FAILED(hr)) if (FAILED(hr))
break; break;
} }
if (SUCCEEDED(hr))
{
pos += length; pos += length;
hr = IAsyncReader_SyncRead(pPin->pReader, pos, 4, header); TRACE("Pos: %x%08x/%x%08x\n", (DWORD)(pos >> 32), (DWORD)pos, (DWORD)(This->EndOfFile>>32), (DWORD)This->EndOfFile);
}
} }
hr = S_OK; hr = S_OK;
TRACE("Duration: %d seconds\n", (DWORD)(duration / 10000000)); TRACE("Duration: %d seconds\n", (DWORD)(duration / 10000000));