marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

quartz: Small mpeg splitter fixes. 

Just to be cautious, since it reads 4 bytes it should stop trying at
EOF-3. Also be more strict with the return values.
oldstable
Maarten Lankhorst 2008-03-30 21:18:49 -07:00 committed by Alexandre Julliard
parent 0faee4af85
commit 6fd90f1625
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/quartz/mpegsplit.c
View File

@ -651,16 +651,18 @@ static HRESULT MPEGSplitter_pre_connect(IPin *iface, IPin *pConnectPin)
This->EndOfFile -= 128;
/* http://mpgedit.org/mpgedit/mpeg_format/mpeghdr.htm has a whole readup on audio headers */
while (pos < This->EndOfFile && SUCCEEDED(hr))
while (pos + 3 < This->EndOfFile)
{
LONGLONG length = 0;
hr = IAsyncReader_SyncRead(pPin->pReader, pos, 4, header);
if (hr != S_OK)
break;
while (parse_header(header, &length, &duration))
{
/* No valid header yet; shift by a byte and check again */
memmove(header, header+1, 3);
hr = IAsyncReader_SyncRead(pPin->pReader, pos++, 1, header + 3);
if (FAILED(hr))
if (hr != S_OK || This->EndOfFile - pos < 4)
break;
}
pos += length;