-Fixed unhelpful error message when deserializing badly formatted regex string

This commit is contained in:
James Newton-King
2018-02-17 21:07:07 +13:00
parent 31b1d7a690
commit 41c3a71e62
4 changed files with 83 additions and 26 deletions
@@ -150,14 +150,23 @@ namespace Newtonsoft.Json.Converters
private object ReadRegexString(JsonReader reader)
{
string regexText = (string)reader.Value;
int patternOptionDelimiterIndex = regexText.LastIndexOf('/');
string patternText = regexText.Substring(1, patternOptionDelimiterIndex - 1);
string optionsText = regexText.Substring(patternOptionDelimiterIndex + 1);
if (regexText.Length > 0 && regexText[0] == '/')
{
int patternOptionDelimiterIndex = regexText.LastIndexOf('/');
RegexOptions options = MiscellaneousUtils.GetRegexOptions(optionsText);
if (patternOptionDelimiterIndex > 0)
{
string patternText = regexText.Substring(1, patternOptionDelimiterIndex - 1);
string optionsText = regexText.Substring(patternOptionDelimiterIndex + 1);
return new Regex(patternText, options);
RegexOptions options = MiscellaneousUtils.GetRegexOptions(optionsText);
return new Regex(patternText, options);
}
}
throw JsonSerializationException.Create(reader, "Regex pattern must be enclosed by slashes.");
}
private Regex ReadRegexObject(JsonReader reader, JsonSerializer serializer)