[FFmpeg-cvslog] avcodec/htmlsubtitles: Fix reading one byte beyond the array

Michael Niedermayer git at videolan.org
Sat Nov 12 04:23:26 EET 2016


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Fri Nov 11 02:25:42 2016 +0100| [04bd1b38ee6b8df410d0ab8d4949546b6c4af26a] | committer: Michael Niedermayer

avcodec/htmlsubtitles: Fix reading one byte beyond the array

Fixes: fuzz-2-ffmpeg_SUBTITLE_AV_CODEC_ID_SUBRIP_fuzzer

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=04bd1b38ee6b8df410d0ab8d4949546b6c4af26a
---

 libavcodec/htmlsubtitles.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/htmlsubtitles.c b/libavcodec/htmlsubtitles.c
index a2cd40f..8b57feb 100644
--- a/libavcodec/htmlsubtitles.c
+++ b/libavcodec/htmlsubtitles.c
@@ -146,7 +146,7 @@ void ff_htmlmarkup_to_ass(void *log_ctx, AVBPrint *dst, const char *in)
                                 if (stack[sptr].param[i][0])
                                     av_bprintf(dst, "%s", stack[sptr].param[i]);
                         }
-                    } else if (!tagname[1] && strspn(tagname, "bisu") == 1) {
+                    } else if (tagname[0] && !tagname[1] && strspn(tagname, "bisu") == 1) {
                         av_bprintf(dst, "{\\%c%d}", tagname[0], !tag_close);
                     } else {
                         unknown = 1;



More information about the ffmpeg-cvslog mailing list