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.

quartz: Small mpeg splitter fixes.
6fd90f16 · Maarten Lankhorst · Alexandre Julliard · 0faee4af · 6fd90f16
Commit 6fd90f16 authored Mar 30, 2008 by Maarten Lankhorst Committed by Alexandre Julliard Apr 01, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

mpegsplit.c dlls/quartz/mpegsplit.c +4 -2

No files found.
--- a/dlls/quartz/mpegsplit.c
+++ b/dlls/quartz/mpegsplit.c
@@ -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;