Module: libav
Branch: master
Commit: fbcaceb1ff797245240ec58ee9cac44a90b8f73a

Author:    Carl Eugen Hoyos <[email protected]>
Committer: Anton Khirnov <[email protected]>
Date:      Thu Nov 17 14:12:34 2011 +0100

mov: do not try to read total disc/track number if data atom is too short.

Fixes bug 308.

Signed-off-by: Anton Khirnov <[email protected]>

---

 libavformat/mov.c |    5 +++--
 1 files 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

_______________________________________________
libav-commits mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-commits

Reply via email to