avcodec/htmlsubtitles: Fix reading one byte beyond the array

michaelni · michaelni · commit 04bd1b38ee6b · 2016-11-12T03:23:03.000+01:00
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@niedermayer.cc>
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ void ff_htmlmarkup_to_ass(void log_ctx, AVBPrint dst, const char *in)`
`146`	`146`	`if (stack[sptr].param[i][0])`
`147`	`147`	`av_bprintf(dst, "%s", stack[sptr].param[i]);`
`148`	`148`	`}`
`149`		`- } else if (!tagname[1] && strspn(tagname, "bisu") == 1) {`
	`149`	`+ } else if (tagname[0] && !tagname[1] && strspn(tagname, "bisu") == 1) {`
`150`	`150`	`av_bprintf(dst, "{\\%c%d}", tagname[0], !tag_close);`
`151`	`151`	`} else {`
`152`	`152`	`unknown = 1;`