generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/assenc: fix potential overread.

Browse Source
This commit is contained in:
Clément Bœsch 2013-09-08 18:23:44 +02:00
parent 378a830e7b
commit 860a081058
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/assenc.c
View File

@ -80,9 +80,16 @@ static int ass_encode_frame(AVCodecContext *avctx,
* will be "Marked=N" instead of the layer num, so we will * will be "Marked=N" instead of the layer num, so we will
* have layer=0, which is fine. */ * have layer=0, which is fine. */
layer = strtol(ass, &p, 10); layer = strtol(ass, &p, 10);
if (*p) p += strcspn(p, ",") + 1; // skip layer or marked
if (*p) p += strcspn(p, ",") + 1; // skip start timestamp #define SKIP_ENTRY(ptr) do { \
if (*p) p += strcspn(p, ",") + 1; // skip end timestamp char *sep = strchr(ptr, ','); \
if (sep) \
ptr = sep + 1; \
} while (0)
SKIP_ENTRY(p); // skip layer or marked
SKIP_ENTRY(p); // skip start timestamp
SKIP_ENTRY(p); // skip end timestamp
snprintf(ass_line, sizeof(ass_line), "%d,%ld,%s", ++s->id, layer, p); snprintf(ass_line, sizeof(ass_line), "%d,%ld,%s", ++s->id, layer, p);
ass_line[strcspn(ass_line, "\r\n")] = 0; ass_line[strcspn(ass_line, "\r\n")] = 0;
ass = ass_line; ass = ass_line;