Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-11-25 20:52:44 +01:00
Code Issues Projects Releases Wiki Activity

Fix possible crash in WebVTT

Browse Source
This commit is contained in:
niksedk 2023-10-21 06:24:16 +02:00
parent b303f9fe09
commit 9600a761fc
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/libse/SubtitleFormats/WebVTT.cs
View File

@ -345,7 +345,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
foreach (var paragraph in subtitle.Paragraphs) foreach (var paragraph in subtitle.Paragraphs)
{ {
// paragraph.Text = ColorWebVttToHtml(paragraph.Text); // paragraph.Text = ColorWebVttToHtml(paragraph.Text);
paragraph.Text = EscapeDecodeText(paragraph.Text); paragraph.Text = EscapeDecodeText(paragraph.Text);
paragraph.Text = RemoveWeirdRepeatingHeader(paragraph.Text); paragraph.Text = RemoveWeirdRepeatingHeader(paragraph.Text);
} }
@ -590,7 +590,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
return string.Empty; return string.Empty;
} }
return s.Substring(list.Min(p=>p)); return s.Substring(list.Min(p => p));
} }
internal static string GetRegion(string s) internal static string GetRegion(string s)
@ -601,6 +601,11 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
private static string GetTag(string s, string tag) private static string GetTag(string s, string tag)
{ {
if (s == null)
{
return null;
}
var pos = s.IndexOf(tag, StringComparison.Ordinal); var pos = s.IndexOf(tag, StringComparison.Ordinal);
if (pos >= 0) if (pos >= 0)
{ {
@ -818,7 +823,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
while (match.Success) while (match.Success)
{ {
var value = match.Value.Substring(3, match.Value.Length - 4); var value = match.Value.Substring(3, match.Value.Length - 4);
if (match.Value.StartsWith("<c.color", StringComparison.Ordinal) && if (match.Value.StartsWith("<c.color", StringComparison.Ordinal) &&
match.Length == 15 && match.Value.EndsWith('>')) match.Length == 15 && match.Value.EndsWith('>'))
{ {
value = "#" + match.Value.Substring(3 + 5, match.Value.Length - 4 - 5); value = "#" + match.Value.Substring(3 + 5, match.Value.Length - 4 - 5);