diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-11-17 19:45:03 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-11-23 22:29:31 +0300 |
| commit | e9f3cc7fc784a321604e198e5ba80dd6004734f4 (patch) | |
| tree | 4c916365678794372bf8cacc479a8ece802dae3a /libavcodec/ass_split.c | |
| parent | ee5677737942ed0ab898f696d39164ee234d2f0a (diff) | |
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 <michael@niedermayer.cc>
(cherry picked from commit ae514b1254318ae5e76be2c17055f14b4084ccf0)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/ass_split.c')
| -rw-r--r-- | libavcodec/ass_split.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |