diff options
| author | Michael Niedermayer <[email protected]> | 2016-01-17 15:39:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2016-01-28 15:53:54 +0100 |
| commit | c6f6829ce6e0e3dd7d5d6f084bc8437e84ec7ee5 (patch) | |
| tree | 3d669abbfdc430801250012bb76e7570e473409a | |
| parent | b9551e71bf3309a1561e58a8efef66fe1b109ae9 (diff) | |
avcodec/ass_split: Fix null pointer dereference in ff_ass_style_get()
Fixes: 55d71971da50365d542ed14b65565fe1/signal_sigsegv_4765a4_8499_f146af090a94f591d6254515c7700ef5.mkv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Reviewed-by: Andreas Cadhalpun <[email protected]>
Signed-off-by: Michael Niedermayer <[email protected]>
(cherry picked from commit 158f0545d81b2aca1c936490f80d13988616910e)
Signed-off-by: Michael Niedermayer <[email protected]>
| -rw-r--r-- | libavcodec/ass_split.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/ass_split.c b/libavcodec/ass_split.c index 9bc7b9d5d6..f84a686b03 100644 --- a/libavcodec/ass_split.c +++ b/libavcodec/ass_split.c @@ -525,7 +525,7 @@ ASSStyle *ff_ass_style_get(ASSSplitContext *ctx, const char *style) if (!style || !*style) style = "Default"; for (i=0; i<ass->styles_count; i++) - if (!strcmp(ass->styles[i].name, style)) + if (ass->styles[i].name && !strcmp(ass->styles[i].name, style)) return ass->styles + i; return NULL; } |