From b69c2e0e6dab87bb90fece1d0de47c28394aa8e6 Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Fri, 3 Feb 2012 19:13:45 +0000 Subject: [PATCH] yop: Check return value of avio_seek and avoid modifying state if it fails Signed-off-by: Paul B Mahol Signed-off-by: Justin Ruggles --- libavformat/yop.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavformat/yop.c b/libavformat/yop.c index e50025970d..f10d8b6d39 100644 --- a/libavformat/yop.c +++ b/libavformat/yop.c @@ -184,8 +184,6 @@ static int yop_read_seek(AVFormatContext *s, int stream_index, int64_t frame_pos, pos_min, pos_max; int frame_count; - av_free_packet(&yop->video_packet); - if (!stream_index) return -1; @@ -196,9 +194,13 @@ static int yop_read_seek(AVFormatContext *s, int stream_index, timestamp = FFMAX(0, FFMIN(frame_count, timestamp)); frame_pos = timestamp * yop->frame_size + pos_min; + + if (avio_seek(s->pb, frame_pos, SEEK_SET) < 0) + return -1; + + av_free_packet(&yop->video_packet); yop->odd_frame = timestamp & 1; - avio_seek(s->pb, frame_pos, SEEK_SET); return 0; }