Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-06-11 18:58:45 +0300
committerMichael Niedermayer <michael@niedermayer.cc>2017-06-18 15:50:30 +0300
commit4132218b87cd6fb13abd162e3037ef4563286baa (patch)
treecd16ff467d4186784f4347a18b115ef2cbd3ed3f /libavcodec/htmlsubtitles.c
parent27c20068054d8c6786833234f7b6db19f1e98362 (diff)
avcodec/htmlsubtitles: Replace very slow redundant sscanf() calls by cleaner and faster code
This reduces the worst case from O(n²) to O(n) time Fixes Timeout Fixes: 2127/clusterfuzz-testcase-minimized-6595787859427328 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/htmlsubtitles.c')
-rw-r--r--libavcodec/htmlsubtitles.c20
1 files changed, 15 insertions, 5 deletions
diff --git a/libavcodec/htmlsubtitles.c b/libavcodec/htmlsubtitles.c
index 16295daa0c..70311c66d5 100644
--- a/libavcodec/htmlsubtitles.c
+++ b/libavcodec/htmlsubtitles.c
@@ -56,6 +56,7 @@ 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;
SrtStack stack[16];
+ int closing_brace_missing = 0;
stack[0].tag[0] = 0;
strcpy(stack[0].param[PARAM_SIZE], "{\\fs}");
@@ -83,11 +84,20 @@ int ff_htmlmarkup_to_ass(void *log_ctx, AVBPrint *dst, const char *in)
and all microdvd like styles such as {Y:xxx} */
len = 0;
an += sscanf(in, "{\\an%*1u}%n", &len) >= 0 && len > 0;
- if ((an != 1 && (len = 0, sscanf(in, "{\\%*[^}]}%n", &len) >= 0 && len > 0)) ||
- (len = 0, sscanf(in, "{%*1[CcFfoPSsYy]:%*[^}]}%n", &len) >= 0 && len > 0)) {
- in += len - 1;
- } else
- av_bprint_chars(dst, *in, 1);
+
+ if (!closing_brace_missing) {
+ if ( (an != 1 && in[1] == '\\')
+ || (in[1] && strchr("CcFfoPSsYy", in[1]) && in[2] == ':')) {
+ char *bracep = strchr(in+2, '}');
+ if (bracep) {
+ in = bracep;
+ break;
+ } else
+ closing_brace_missing = 1;
+ }
+ }
+
+ av_bprint_chars(dst, *in, 1);
break;
case '<':
tag_close = in[1] == '/';