summaryrefslogtreecommitdiff
path: root/libavcodec/htmlsubtitles.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-05-06 01:42:53 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-05-08 17:02:02 +0200
commitf4ae3cce64bd46b1d539bdeac39753f83015f114 (patch)
tree4340bf904fd6de7d818f91f0b62a93d4c1cb2a0f /libavcodec/htmlsubtitles.c
parentaaeec1c654a2c139a7bc95e677a23d8ac57f1c5e (diff)
downloadffmpeg-f4ae3cce64bd46b1d539bdeac39753f83015f114.tar.gz
avcodec/htmlsubtitles: Check for string truncation and return error
Fixes out of array access Fixes: 1354/clusterfuzz-testcase-minimized-5520132195483648 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/htmlsubtitles.c')
-rw-r--r--libavcodec/htmlsubtitles.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/libavcodec/htmlsubtitles.c b/libavcodec/htmlsubtitles.c
index 8b57febd26..16295daa0c 100644
--- a/libavcodec/htmlsubtitles.c
+++ b/libavcodec/htmlsubtitles.c
@@ -46,11 +46,12 @@ typedef struct SrtStack {
static void rstrip_spaces_buf(AVBPrint *buf)
{
- while (buf->len > 0 && buf->str[buf->len - 1] == ' ')
- buf->str[--buf->len] = 0;
+ if (av_bprint_is_complete(buf))
+ while (buf->len > 0 && buf->str[buf->len - 1] == ' ')
+ buf->str[--buf->len] = 0;
}
-void ff_htmlmarkup_to_ass(void *log_ctx, AVBPrint *dst, const char *in)
+int ff_htmlmarkup_to_ass(void *log_ctx, AVBPrint *dst, const char *in)
{
char *param, buffer[128], tmp[128];
int len, tag_close, sptr = 1, line_start = 1, an = 0, end = 0;
@@ -171,8 +172,13 @@ void ff_htmlmarkup_to_ass(void *log_ctx, AVBPrint *dst, const char *in)
line_start = 0;
}
+ if (!av_bprint_is_complete(dst))
+ return AVERROR(ENOMEM);
+
while (dst->len >= 2 && !strncmp(&dst->str[dst->len - 2], "\\N", 2))
dst->len -= 2;
dst->str[dst->len] = 0;
rstrip_spaces_buf(dst);
+
+ return 0;
}