Imported Upstream version 4.3.2.467

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

View File

@@ -404,7 +404,8 @@ namespace System.Web.Configuration {
return null;
}
Regex regex = new Regex("\\.NET CLR (?'clrVersion'[0-9\\.]*)");
// Adding timeout for Regex in case of malicious UA string causing DoS
Regex regex = RegexUtil.CreateRegex("\\.NET CLR (?'clrVersion'[0-9\\.]*)", RegexOptions.None);
MatchCollection matches = regex.Matches(ua);
if (matches.Count == 0) {