aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-05-23 00:23:05 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-06-01 23:25:19 +0200
commit236452f83e5d4de2187a3a71e91807a7a5bbf496 (patch)
tree446ba3b38fb69359cb0689896b1f2ac00fe0856f
parentb45f67b05acdbb3d5b71eb30e6cbe7fa6841334e (diff)
downloadffmpeg-236452f83e5d4de2187a3a71e91807a7a5bbf496.tar.gz
avformat/nutdec: Check X in 2nd branch of index reading
Prevents read of uninitialized variable Based on patch by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit ebb0ca3d70465ab6d369a66b2ef43bb059705db8) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/nutdec.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index 94dd11976a..488ae1683d 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -703,6 +703,10 @@ static int find_and_decode_index(NUTContext *nut)
has_keyframe[n++] = flag;
has_keyframe[n++] = !flag;
} else {
+ if (x <= 1) {
+ av_log(s, AV_LOG_ERROR, "index: x %"PRIu64" is invalid\n", x);
+ goto fail;
+ }
while (x != 1) {
if (n >= syncpoint_count + 1) {
av_log(s, AV_LOG_ERROR, "index overflow B\n");