Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-10-27 22:42:38 +01:00
Code Issues Projects Releases Wiki Activity

Fix crash in quote detection

Browse Source
This commit is contained in:
Martijn van Berkel (Flitskikker) 2020-04-25 21:32:51 +02:00
parent 6db80c5f1c
commit a9011f22f2
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libse/ContinuationUtilities.cs
View File

@ -846,14 +846,14 @@ namespace Nikse.SubtitleEdit.Core
public static bool IsFullLineTag(string input, int position)
{
input = ExtractParagraphOnly(input);
// Return if empty string
if (string.IsNullOrEmpty(input))
{
return false;
}
input = ExtractParagraphOnly(input);
var lineStartIndex = (position > 0 && position < input.Length) ? input.LastIndexOf("\n", position, StringComparison.Ordinal) : 0;
if (lineStartIndex == -1)
{
@ -888,7 +888,10 @@ namespace Nikse.SubtitleEdit.Core
}
var textToRemove = input.Substring(startIndex, endIndex - startIndex);
input = input.Replace(textToRemove, "");
if (!string.IsNullOrEmpty(textToRemove))
{
input = input.Replace(textToRemove, "");
}
foreach (var c in input)
{
@ -901,16 +904,19 @@ namespace Nikse.SubtitleEdit.Core
return true;
}
public static bool IsFullLineQuote(string input, int position, char quoteStart, char quoteEnd)
public static bool IsFullLineQuote(string originalInput, int position, char quoteStart, char quoteEnd)
{
input = ExtractParagraphOnly(input);
// Return if empty string
if (string.IsNullOrEmpty(input))
if (string.IsNullOrEmpty(originalInput))
{
return false;
}
string input = ExtractParagraphOnly(originalInput);
// Shift index if needed after deleting { } tags
position -= Math.Max(0, originalInput.IndexOf(input, StringComparison.Ordinal));
var startIndex = position;
var endIndex = position;
@ -942,7 +948,10 @@ namespace Nikse.SubtitleEdit.Core
endIndex = Math.Min(input.Length, endIndex);
var textToRemove = input.Substring(startIndex, endIndex - startIndex);
input = input.Replace(textToRemove, "");
if (!string.IsNullOrEmpty(textToRemove))
{
input = input.Replace(textToRemove, "");
}
foreach (var c in input)
{