summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <[email protected]>2015-05-23 00:23:05 +0200
committerMichael Niedermayer <[email protected]>2015-05-23 00:52:44 +0200
commit3ea101b234485d43c0f538d77b208311aec4023b (patch)
tree75cbbea9ef5f7310f85516cde9c65ea2f128ef77
parent3c7ea2c46ef719244a1723d5d6b52f0733095ae1 (diff)
avformat/nutdec: Check X in 2nd branch of index reading
Prevents read of uninitialized variable Based on patch by: Andreas Cadhalpun <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit ebb0ca3d70465ab6d369a66b2ef43bb059705db8) Signed-off-by: Michael Niedermayer <[email protected]>
-rw-r--r--libavformat/nutdec.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index 2188066fe4..72a24368ca 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -706,6 +706,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");