diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-23 00:23:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-17 21:50:08 +0200 |
| commit | fe1e6b919d8d3145c163fde456edcfad1ac13cfc (patch) | |
| tree | 804becf4a5c0afd47ef6b48fcda9487bde6c1b7e | |
| parent | 8cfc0fdb23e14dca402217a99e374f98355a3d60 (diff) | |
| download | ffmpeg-fe1e6b919d8d3145c163fde456edcfad1ac13cfc.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.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index d2d90b0559..7f7a61cc56 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -679,6 +679,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"); |