virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

ass_split: fix out of array access in ass_split()

Browse Source 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-01-11 02:51:27 +01:00
parent 97b1ba696b
commit 8b47058c61
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/ass_split.c
View File

@ -285,14 +285,17 @@ static int ass_split(ASSSplitContext *ctx, const char *buf)
while (buf && *buf) { while (buf && *buf) {
if (sscanf(buf, "[%15[0-9A-Za-z+ ]]%c", section, &c) == 2) { if (sscanf(buf, "[%15[0-9A-Za-z+ ]]%c", section, &c) == 2) {
buf += strcspn(buf, "\n") + 1; buf += strcspn(buf, "\n");
buf += !!*buf;
for (i=0; i<FF_ARRAY_ELEMS(ass_sections); i++) for (i=0; i<FF_ARRAY_ELEMS(ass_sections); i++)
if (!strcmp(section, ass_sections[i].section)) { if (!strcmp(section, ass_sections[i].section)) {
ctx->current_section = i; ctx->current_section = i;
buf = ass_split_section(ctx, buf); buf = ass_split_section(ctx, buf);
} }
} else } else {
buf += strcspn(buf, "\n") + 1; buf += strcspn(buf, "\n");
buf += !!*buf;
}
} }
return buf ? 0 : AVERROR_INVALIDDATA; return buf ? 0 : AVERROR_INVALIDDATA;
} }