diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-23 01:23:05 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-20 05:43:39 +0300 |
| commit | bd9313d9f840ea4d96b36547e42014f0fba6cfa8 (patch) | |
| tree | c8e00939a7780a0e6f6a87d97ea20790eba9a7d4 | |
| parent | 627040156193a48415761d61be27491c74e0119b (diff) | |
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.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index bb17e90a28..596dd5c608 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"); |