commit 6fd90f16259fd91743ca6bb7869c5e2d15a43f45
author Maarten Lankhorst <m.b.lankhorst@gmail.com> Sun Mar 30 21:18:49 2008 -0700
committer Alexandre Julliard <julliard@winehq.org> Tue Apr 01 23:21:38 2008 +0200
tree 8eb1a8fb180ec828530f653a45f8d24f75ea79ee
parent 0faee4af8504eef86a5b86b279a0afca4a1b32c3

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.

dlls/quartz/mpegsplit.c

diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c
index dca0042..0ecafc8 100644
--- a/dlls/quartz/mpegsplit.c
+++ b/dlls/quartz/mpegsplit.c
@@ -651,16 +651,18 @@
                 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;