ffmpeg | branch: release/1.0 | Dale Curtis <[email protected]> | Thu Jan 10 11:05:29 2013 -0800| [85b1ce977bd5d477cd47d0942e1a09f0a56e6778] | committer: Michael Niedermayer
matroska: Fix use after free Signed-off-by: Dale Curtis <[email protected]> Signed-off-by: Luca Barbato <[email protected]> (cherry picked from commit ae3d41636942cbc0236bad21ad06c65f4eb0f096) Signed-off-by: Michael Niedermayer <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=85b1ce977bd5d477cd47d0942e1a09f0a56e6778 --- libavformat/matroskadec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 44c1a8f..59130f1 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1880,6 +1880,7 @@ static int matroska_deliver_packet(MatroskaDemuxContext *matroska, */ static void matroska_clear_queue(MatroskaDemuxContext *matroska) { + matroska->prev_pkt = NULL; if (matroska->packets) { int n; for (n = 0; n < matroska->num_packets; n++) { @@ -2393,7 +2394,6 @@ static int matroska_read_seek(AVFormatContext *s, int stream_index, avio_seek(s->pb, st->index_entries[st->nb_index_entries-1].pos, SEEK_SET); matroska->current_id = 0; while ((index = av_index_search_timestamp(st, timestamp, flags)) < 0) { - matroska->prev_pkt = NULL; matroska_clear_queue(matroska); if (matroska_parse_cluster(matroska) < 0) break; _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
