[FFmpeg-cvslog] mov: do not try to read total disc/track number if data atom is too short.
Carl Eugen Hoyos
git at videolan.org
Wed Jun 27 00:02:55 CEST 2012
ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Thu Nov 17 14:12:34 2011 +0100| [fbcaceb1ff797245240ec58ee9cac44a90b8f73a] | committer: Anton Khirnov
mov: do not try to read total disc/track number if data atom is too short.
Fixes bug 308.
Signed-off-by: Anton Khirnov <anton at khirnov.net>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fbcaceb1ff797245240ec58ee9cac44a90b8f73a
---
libavformat/mov.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/libavformat/mov.c b/libavformat/mov.c
index fa70eff..6325401 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -71,10 +71,11 @@ static int mov_metadata_track_or_disc_number(MOVContext *c, AVIOContext *pb,
{
char buf[16];
- short current, total;
+ short current, total = 0;
avio_rb16(pb); // unknown
current = avio_rb16(pb);
- total = avio_rb16(pb);
+ if (len >= 6)
+ total = avio_rb16(pb);
if (!total)
snprintf(buf, sizeof(buf), "%d", current);
else
More information about the ffmpeg-cvslog
mailing list