[FFmpeg-cvslog] avformat/xmv: Discard remainder of packet on error

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michael at niedermayer.cc> | Fri Nov  6 02:13:36 2015 +0100| [76950e5247334dee45bdc73af7a2f134fea4da02] | committer: Michael Niedermayer

avformat/xmv: Discard remainder of packet on error

Fixes infinite loop
Fixes: 9c48ae2680c5f23bca3d20ff0f325fd8/asan_generic_4c254d_1374_993f1e5967dd6f844b8d72f978ce2a6c.pss

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 79c4a338e4b2bf0bc6f81c9f455994f673a92f78)

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=76950e5247334dee45bdc73af7a2f134fea4da02
---

 libavformat/xmv.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libavformat/xmv.c b/libavformat/xmv.c
index cee2c80..1410bff 100644
--- a/libavformat/xmv.c
+++ b/libavformat/xmv.c
@@ -552,8 +552,11 @@ static int xmv_read_packet(AVFormatContext *s,
 
         result = xmv_fetch_audio_packet(s, pkt, xmv->current_stream - 1);
     }
-    if (result)
+    if (result) {
+        xmv->current_stream = 0;
+        xmv->video.current_frame = xmv->video.frame_count;
         return result;
+    }
 
 
     /* Increase our counters */