Browse Source

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@niedermayer.cc>
(cherry picked from commit 79c4a338e4)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
tags/n2.4.12
Michael Niedermayer 10 years ago
parent
commit
76950e5247
1 changed files with 4 additions and 1 deletions
  1. +4
    -1
      libavformat/xmv.c

+ 4
- 1
libavformat/xmv.c View File

@@ -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 */


Loading…
Cancel
Save