From ae514b1254318ae5e76be2c17055f14b4084ccf0 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 17 Nov 2016 17:45:03 +0100 Subject: [PATCH] avcodec/ass_split: Change order of operations in ass_split_section() This matches the other branch Fixes out of array read Fixes: 4d142ca76d39fe685effcf5017098723/asan_heap-oob_31ae824_8611_348fdb64f9009b63c8a8eae9a0e497c5.mkv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer --- libavcodec/ass_split.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/ass_split.c b/libavcodec/ass_split.c index d3e8a8d555..872528bdfa 100644 --- a/libavcodec/ass_split.c +++ b/libavcodec/ass_split.c @@ -275,7 +275,7 @@ static const char *ass_split_section(ASSSplitContext *ctx, const char *buf) } if (section->format_header && !order) { len = strlen(section->format_header); - if (buf[len] == ':' && !strncmp(buf, section->format_header, len)) { + if (!strncmp(buf, section->format_header, len) && buf[len] == ':') { buf += len + 1; while (!is_eol(*buf)) { buf = skip_space(buf);