Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2025-01-31 13:01:39 +01:00
Code Issues Projects Releases Wiki Activity

Fix #1211 - strip control characters from input - thx SirEllert / xylographe :)

Browse Source
This commit is contained in:
niksedk 2015-08-31 21:48:13 +02:00
parent 020e95c5b2
commit aae3152746
6 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libse/Dictionaries/NamesList.cs
View File

@ -200,7 +200,7 @@ namespace Nikse.SubtitleEdit.Core.Dictionaries
public bool Add(string name)
{
name = name.Trim();
name = name.Trim().RemoveControlCharacters();
if (name.Length > 1 && name.ContainsLetter())
{
if (name.Contains(' '))

2
src/Forms/AddToNames.cs
View File

@ -79,7 +79,7 @@ namespace Nikse.SubtitleEdit.Forms
return;
}
NewName = textBoxAddName.Text.Trim();
NewName = textBoxAddName.Text.Trim().RemoveControlCharacters();
string languageName = null;
_language = Configuration.Settings.Language.Main;

4
src/Forms/AddToOcrReplaceList.cs
View File

@ -22,8 +22,8 @@ namespace Nikse.SubtitleEdit.Forms
private void buttonOK_Click(object sender, EventArgs e)
{
string key = textBoxOcrFixKey.Text.Trim();
string value = textBoxOcrFixValue.Text.Trim();
string key = textBoxOcrFixKey.Text.Trim().RemoveControlCharacters();
string value = textBoxOcrFixValue.Text.Trim().RemoveControlCharacters();
if (key.Length == 0 || value.Length == 0 || key == value)
return;

2
src/Forms/AddToUserDic.cs
View File

@ -30,7 +30,7 @@ namespace Nikse.SubtitleEdit.Forms
private void buttonOK_Click(object sender, EventArgs e)
{
NewWord = textBoxAddName.Text.Trim().ToLower();
NewWord = textBoxAddName.Text.Trim().ToLower().RemoveControlCharacters();
if (NewWord.Length == 0)
{
DialogResult = DialogResult.Cancel;

14
src/Forms/MultipleReplace.cs
View File

@ -360,7 +360,13 @@ namespace Nikse.SubtitleEdit.Forms
if (listViewReplaceList.SelectedItems.Count != 1)
return;
if (textBoxFind.Text.Length > 0)
string findText = textBoxFind.Text.RemoveControlCharacters();
textBoxFind.Text = findText;
string replaceText = textBoxReplace.Text.RemoveControlCharacters();
textBoxReplace.Text = replaceText;
if (findText.Length > 0)
{
string searchType = SearchTypeNormal;
if (radioButtonCaseSensitive.Checked)
@ -370,7 +376,7 @@ namespace Nikse.SubtitleEdit.Forms
else if (radioButtonRegEx.Checked)
{
searchType = SearchTypeRegularExpression;
if (!Utilities.IsValidRegex(textBoxFind.Text))
if (!Utilities.IsValidRegex(findText))
{
MessageBox.Show(Configuration.Settings.Language.General.RegularExpressionIsNotValid);
textBoxFind.Select();
@ -379,8 +385,8 @@ namespace Nikse.SubtitleEdit.Forms
}
var item = listViewReplaceList.SelectedItems[0];
item.SubItems[1].Text = textBoxFind.Text;
item.SubItems[2].Text = textBoxReplace.Text;
item.SubItems[1].Text = findText;
item.SubItems[2].Text = replaceText;
item.SubItems[3].Text = EnglishSearchTypeToLocal(searchType);
GeneratePreview();

8
src/Forms/Settings.cs
View File

@ -1797,7 +1797,7 @@ namespace Nikse.SubtitleEdit.Forms
private void ButtonAddNamesEtcClick(object sender, EventArgs e)
{
string language = GetCurrentWordListLanguage();
string text = textBoxNameEtc.Text.Trim();
string text = textBoxNameEtc.Text.Trim().RemoveControlCharacters();
if (!string.IsNullOrEmpty(language) && text.Length > 1 && !_wordListNamesEtc.Contains(text))
{
var namesList = new NamesList(Configuration.DictionariesFolder, language, Configuration.Settings.WordLists.UseOnlineNamesEtc, Configuration.Settings.WordLists.NamesEtcUrl);
@ -1897,7 +1897,7 @@ namespace Nikse.SubtitleEdit.Forms
private void ButtonAddUserWordClick(object sender, EventArgs e)
{
string language = GetCurrentWordListLanguage();
string text = textBoxUserWord.Text.Trim().ToLower();
string text = textBoxUserWord.Text.Trim().ToLower().RemoveControlCharacters();
if (!string.IsNullOrEmpty(language) && text.Length > 0 && !_userWordList.Contains(text))
{
Utilities.AddToUserDictionary(text, language);
@ -2006,8 +2006,8 @@ namespace Nikse.SubtitleEdit.Forms
private void ButtonAddOcrFixClick(object sender, EventArgs e)
{
string key = textBoxOcrFixKey.Text.Trim();
string value = textBoxOcrFixValue.Text.Trim();
string key = textBoxOcrFixKey.Text.Trim().RemoveControlCharacters();
string value = textBoxOcrFixValue.Text.Trim().RemoveControlCharacters();
if (key.Length == 0 || value.Length == 0 || key == value || Utilities.IsInteger(key))
return;