Prevented infinite loop in QMoviePrivate::next().

If we're unable to read the first frame, we shouldn't return an end
marker, as that will cause QMoviePrivate::next() to recurse
indefinitely when the playCounter is set to -1 (infinite).

Reviewed-by: Olivier Goffart

1 files changed, 5 insertions, 1 deletions

diff --git a/src/gui/image/qmovie.cpp b/src/gui/image/qmovie.cpp
index 911a2b5..eb139fa 100644
--- a/src/gui/image/qmovie.cpp
+++ b/src/gui/image/qmovie.cpp
@@ -381,10 +381,14 @@ QFrameInfo QMoviePrivate::infoForFrame(int frameNumber)
             QPixmap aPixmap = QPixmap::fromImage(anImage);
             int aDelay = reader->nextImageDelay();
             return QFrameInfo(aPixmap, aDelay);
-        } else {
+        } else if (frameNumber != 0) {
             // We've read all frames now. Return an end marker
             haveReadAll = true;
             return QFrameInfo::endMarker();
+        } else {
+            // No readable frames
+            haveReadAll = true;
+            return QFrameInfo();
         }
     }