mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.3.2.467

Browse Source 
Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d
This commit is contained in:
Xamarin Public Jenkins
2016-02-22 11:00:01 -05:00
parent f302175246
commit f3e3aab35a
4097 changed files with 122406 additions and 82300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
external/referencesource/System.Web/UI/WebControls/RegularExpressionValidator.cs vendored
View File

@@ -54,6 +54,8 @@ namespace System.Web.UI.WebControls {
}
}
// The timeout for regex
public int? MatchTimeout { get; set; }
/// <internalonly/>
/// <devdoc>
@@ -87,9 +89,14 @@ namespace System.Web.UI.WebControls {
try {
// we are looking for an exact match, not just a search hit
Match m = Regex.Match(controlValue, ValidationExpression);
// Adding timeout for Regex in case of malicious string causing DoS
Match m = RegexUtil.Match(controlValue, ValidationExpression, RegexOptions.None, MatchTimeout);
return(m.Success && m.Index == 0 && m.Length == controlValue.Length);
}
}
catch (ArgumentOutOfRangeException) {
throw;
}
catch {
Debug.Fail("Regex error should have been caught in property setter.");
return true;