Change MaxDepth default to 64 (#2473)

This commit is contained in:
James Newton-King
2021-02-21 15:13:51 +13:00
committed by GitHub
parent 15525f1c44
commit b6dc05be5a
3 changed files with 5 additions and 5 deletions
@@ -8000,10 +8000,10 @@ This is just junk, though.";
public void SetMaxDepth_DepthExceeded() public void SetMaxDepth_DepthExceeded()
{ {
JsonTextReader reader = new JsonTextReader(new StringReader("[[['text']]]")); JsonTextReader reader = new JsonTextReader(new StringReader("[[['text']]]"));
Assert.AreEqual(128, reader.MaxDepth); Assert.AreEqual(64, reader.MaxDepth);
JsonSerializerSettings settings = new JsonSerializerSettings(); JsonSerializerSettings settings = new JsonSerializerSettings();
Assert.AreEqual(128, settings.MaxDepth); Assert.AreEqual(64, settings.MaxDepth);
Assert.AreEqual(false, settings._maxDepthSet); Assert.AreEqual(false, settings._maxDepthSet);
// Default should be the same // Default should be the same
@@ -8034,7 +8034,7 @@ This is just junk, though.";
serializer.Deserialize(reader); serializer.Deserialize(reader);
Assert.AreEqual(128, reader.MaxDepth); Assert.AreEqual(64, reader.MaxDepth);
} }
} }
} }
+1 -1
View File
@@ -329,7 +329,7 @@ namespace Newtonsoft.Json
_dateTimeZoneHandling = DateTimeZoneHandling.RoundtripKind; _dateTimeZoneHandling = DateTimeZoneHandling.RoundtripKind;
_dateParseHandling = DateParseHandling.DateTime; _dateParseHandling = DateParseHandling.DateTime;
_floatParseHandling = FloatParseHandling.Double; _floatParseHandling = FloatParseHandling.Double;
_maxDepth = 128; _maxDepth = 64;
CloseInput = true; CloseInput = true;
} }
@@ -61,7 +61,7 @@ namespace Newtonsoft.Json
internal static readonly CultureInfo DefaultCulture; internal static readonly CultureInfo DefaultCulture;
internal const bool DefaultCheckAdditionalContent = false; internal const bool DefaultCheckAdditionalContent = false;
internal const string DefaultDateFormatString = @"yyyy'-'MM'-'dd'T'HH':'mm':'ss.FFFFFFFK"; internal const string DefaultDateFormatString = @"yyyy'-'MM'-'dd'T'HH':'mm':'ss.FFFFFFFK";
internal const int DefaultMaxDepth = 128; internal const int DefaultMaxDepth = 64;
internal Formatting? _formatting; internal Formatting? _formatting;
internal DateFormatHandling? _dateFormatHandling; internal DateFormatHandling? _dateFormatHandling;