aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Plate <elupus@ecce.se>2011-09-14 19:24:07 +0200
committerJoakim Plate <elupus@ecce.se>2011-09-14 19:51:07 +0200
commit75f418064ecf5c2713151cbe6b3a716d2c047f1d (patch)
tree0db1bd3e3c2a2f8a39899e285fcbd371e8c642db
parent598cc84fbf137df57b5e273484083606583ec3e8 (diff)
downloadffmpeg-75f418064ecf5c2713151cbe6b3a716d2c047f1d.tar.gz
[cafdec] Check return value of avio_seek and avoid modifying state if it fails
-rw-r--r--libavformat/cafdec.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/libavformat/cafdec.c b/libavformat/cafdec.c
index 8b0daddd58..0938e1a0d7 100644
--- a/libavformat/cafdec.c
+++ b/libavformat/cafdec.c
@@ -366,6 +366,7 @@ static int read_seek(AVFormatContext *s, int stream_index,
{
AVStream *st = s->streams[0];
CaffContext *caf = s->priv_data;
+ CaffContext caf2 = *caf;
int64_t pos;
timestamp = FFMAX(timestamp, 0);
@@ -385,7 +386,10 @@ static int read_seek(AVFormatContext *s, int stream_index,
return -1;
}
- avio_seek(s->pb, pos + caf->data_start, SEEK_SET);
+ if (avio_seek(s->pb, pos + caf->data_start, SEEK_SET) < 0) {
+ *caf = caf2;
+ return -1;
+ }
return 0;
}