Module: libav
Branch: release/12
Commit: 72fd8725a63c83fa5f2c85dba20e768c6a093ebc
Author: Sean McGovern <gsean...@gmail.com>
Committer: Sean McGovern <gsean...@gmail.com>
Date: Fri Jul 28 16:17:33 2017 -0400
mov: log and return early on non-positive stsd entry counts
Based on an FFmpeg patch by Michael Niedermayer <mich...@niedermayer.cc>
(cherry picked from commit d7bdab1ad78ef582ba8c96dc7b79ec9fdbeeb94f)
Signed-off-by: Sean McGovern <gsean...@gmail.com>
---
libavformat/mov.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 2ff5211..9f01aa5 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1902,6 +1902,11 @@ static int mov_read_stsd(MOVContext *c, AVIOContext *pb,
MOVAtom atom)
avio_rb24(pb); /* flags */
entries = avio_rb32(pb);
+ if (entries <= 0) {
+ av_log(c->fc, AV_LOG_ERROR, "invalid STSD entries %d\n", entries);
+ return AVERROR_INVALIDDATA;
+ }
+
if (sc->extradata) {
av_log(c->fc, AV_LOG_ERROR,
"Duplicate stsd found in this track.\n");
_______________________________________________
libav-commits mailing list
libav-commits@libav.org
https://lists.libav.org/mailman/listinfo/libav-commits
