diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-27 17:04:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-08 00:23:43 +0100 |
| commit | dcecca07585fce8716bdf73dab034a05dadb58cb (patch) | |
| tree | cc4b618806c5b242ed3008a64f487a43f750a3c3 | |
| parent | 413065aff4efdc895ec2b4f5e9beedcc6b07376d (diff) | |
| download | ffmpeg-dcecca07585fce8716bdf73dab034a05dadb58cb.tar.gz | |
avutil/log: check that len is within the buffer before reading it
Fixes out of array read
Fixes: asan_heap-oob_19d6979_6857_mmw_deadzy.ogg
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 808c10e728db2d92ccbb0f8b3bcd4a2f4305a2cf)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavutil/log.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/log.c b/libavutil/log.c index fa65b9f02f..03fb30ec75 100644 --- a/libavutil/log.c +++ b/libavutil/log.c @@ -203,7 +203,7 @@ static void format_line(void *ptr, int level, const char *fmt, va_list vl, av_vbprintf(part+2, fmt, vl); if(*part[0].str || *part[1].str || *part[2].str) { - char lastc = part[2].len ? part[2].str[part[2].len - 1] : 0; + char lastc = part[2].len && part[2].len <= part[2].size ? part[2].str[part[2].len - 1] : 0; *print_prefix = lastc == '\n' || lastc == '\r'; } } |