reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-24 04:10:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

quartz: Cope with invalid MP3 headers being detect as valid.

Browse Source 
Signed-off-by: Bruno Jesus <00cpxxx@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Bruno Jesus 2015-10-19 14:43:08 +08:00 committed by Alexandre Julliard
parent 1b1e20ba1d
commit 3f55d106fa
1 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
dlls/quartz/mpegsplit.c
View File

@ -476,7 +476,7 @@ static HRESULT MPEGSplitter_pre_connect(IPin *iface, IPin *pConnectPin, ALLOCATO
HRESULT hr;
LONGLONG pos = 0; /* in bytes */
BYTE header[10];
int streamtype = 0;
int streamtype;
LONGLONG total, avail;
AM_MEDIA_TYPE amt;
PIN_INFO piOutput;
@ -514,12 +514,37 @@ static HRESULT MPEGSplitter_pre_connect(IPin *iface, IPin *pConnectPin, ALLOCATO
hr = IAsyncReader_SyncRead(pPin->pReader, pos, 4, header);
if (SUCCEEDED(hr))
pos += 4;
TRACE("%x:%x:%x:%x\n", header[0], header[1], header[2], header[3]);
} while (0);
while(SUCCEEDED(hr) && !(streamtype=MPEGSplitter_head_check(header)))
while(SUCCEEDED(hr))
{
TRACE("%x:%x:%x:%x\n", header[0], header[1], header[2], header[3]);
TRACE("Testing header %x:%x:%x:%x\n", header[0], header[1], header[2], header[3]);
streamtype = MPEGSplitter_head_check(header);
if (streamtype == MPEG_AUDIO_HEADER)
{
LONGLONG length;
if (parse_header(header, &length, NULL) == S_OK)
{
BYTE next_header[4];
/* Ensure we have a valid header by seeking for the next frame, some bad
* encoded ID3v2 may have an incorrect length and we end up finding bytes
* like FF FE 00 28 which are nothing more than a Unicode BOM followed by
* ')' character from inside a ID3v2 tag. Unfortunately that sequence
* matches like a valid mpeg audio header.
*/
hr = IAsyncReader_SyncRead(pPin->pReader, pos + length - 4, 4, next_header);
if (FAILED(hr))
break;
if (parse_header(next_header, &length, NULL) == S_OK)
break;
TRACE("%x:%x:%x:%x is a fake audio header, looking for next...\n",
header[0], header[1], header[2], header[3]);
}
}
else if (streamtype) /* Video or System stream */
break;
/* 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);