Commit 808c10e7 authored by Michael Niedermayer's avatar Michael Niedermayer

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: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 6b58488f
...@@ -200,7 +200,7 @@ static void format_line(void *ptr, int level, const char *fmt, va_list vl, ...@@ -200,7 +200,7 @@ static void format_line(void *ptr, int level, const char *fmt, va_list vl,
av_vbprintf(part+2, fmt, vl); av_vbprintf(part+2, fmt, vl);
if(*part[0].str || *part[1].str || *part[2].str) { 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'; *print_prefix = lastc == '\n' || lastc == '\r';
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment