-Fixed infinite loop error caused by error handling at the end of JSON content
This commit is contained in:
@@ -276,13 +276,20 @@
|
|||||||
<content>
|
<content>
|
||||||
<!-- Uncomment this to create a sub-section outline
|
<!-- Uncomment this to create a sub-section outline
|
||||||
<autoOutline /> -->
|
<autoOutline /> -->
|
||||||
<para>Serialization of values that are convertible by a JsonConverter (i.e. CanConvert returns true for its type) is
|
<para>Serialization of values that are convertible by a <codeEntityReference>T:Newtonsoft.Json.JsonConverter</codeEntityReference>
|
||||||
|
(i.e. CanConvert returns true for its type) is
|
||||||
completely overridden by the JsonConverter. The test to see whether a value can be converted by a JsonSerializer takes
|
completely overridden by the JsonConverter. The test to see whether a value can be converted by a JsonSerializer takes
|
||||||
precedence over all other tests.</para>
|
precedence over all other tests.</para>
|
||||||
<para> JsonConverters can be defined and specified in a number of places: in an attribute on a member, in an attribute
|
<para>JsonConverters can be defined and specified in a number of places: in an attribute on a member, in an attribute
|
||||||
on a class and added to the JsonSerializer's converters collection. The priority of which JsonConverter is used is the
|
on a class and added to the JsonSerializer's converters collection. The priority of which JsonConverter is used is the
|
||||||
JsonConverter defined by attribute on a member then the JsonConverter defined by an attribute on a class and finally
|
JsonConverter defined by attribute on a member then the JsonConverter defined by an attribute on a class and finally
|
||||||
any converters passed to the JsonSerializer.</para>
|
any converters passed to the JsonSerializer.</para>
|
||||||
|
|
||||||
|
<alert class="note">
|
||||||
|
<para>Because a JsonConverter creates a new value a converter will not work with readonly properties because there is no way to assign the new
|
||||||
|
value to the property. Either change the property to have a public setter or place a JsonPropertyAttribute or DataMemberAttribute on the property.</para>
|
||||||
|
</alert>
|
||||||
|
|
||||||
</content>
|
</content>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
|||||||
@@ -259,14 +259,14 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
List<string> errors = new List<string>();
|
List<string> errors = new List<string>();
|
||||||
|
|
||||||
JsonSerializer serializer = JsonSerializer.Create(new JsonSerializerSettings
|
JsonSerializer serializer = JsonSerializer.Create(new JsonSerializerSettings
|
||||||
{
|
|
||||||
Error = delegate(object sender, ErrorEventArgs args)
|
|
||||||
{
|
{
|
||||||
errors.Add(args.ErrorContext.Path + " - " + args.ErrorContext.Member + " - " + args.ErrorContext.Error.Message);
|
Error = delegate(object sender, ErrorEventArgs args)
|
||||||
args.ErrorContext.Handled = true;
|
{
|
||||||
},
|
errors.Add(args.ErrorContext.Path + " - " + args.ErrorContext.Member + " - " + args.ErrorContext.Error.Message);
|
||||||
Converters = { new IsoDateTimeConverter() }
|
args.ErrorContext.Handled = true;
|
||||||
});
|
},
|
||||||
|
Converters = {new IsoDateTimeConverter()}
|
||||||
|
});
|
||||||
var c = serializer.Deserialize<List<DateTime>>(new JsonTextReader(new StringReader(@"[
|
var c = serializer.Deserialize<List<DateTime>>(new JsonTextReader(new StringReader(@"[
|
||||||
""2009-09-09T00:00:00Z"",
|
""2009-09-09T00:00:00Z"",
|
||||||
""I am not a date and will error!"",
|
""I am not a date and will error!"",
|
||||||
@@ -374,13 +374,13 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
{
|
{
|
||||||
JsonSerializer serializer = new JsonSerializer();
|
JsonSerializer serializer = new JsonSerializer();
|
||||||
serializer.Error += delegate(object sender, ErrorEventArgs args)
|
serializer.Error += delegate(object sender, ErrorEventArgs args)
|
||||||
{
|
{
|
||||||
// only log an error once
|
// only log an error once
|
||||||
if (args.CurrentObject == args.ErrorContext.OriginalObject)
|
if (args.CurrentObject == args.ErrorContext.OriginalObject)
|
||||||
errors.Add(args.ErrorContext.Path + " - " + args.ErrorContext.Member + " - " + args.ErrorContext.Error.Message);
|
errors.Add(args.ErrorContext.Path + " - " + args.ErrorContext.Member + " - " + args.ErrorContext.Error.Message);
|
||||||
};
|
};
|
||||||
|
|
||||||
serializer.Deserialize(new StringReader(json), typeof(List<List<DateTime>>));
|
serializer.Deserialize(new StringReader(json), typeof (List<List<DateTime>>));
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
@@ -420,12 +420,12 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
|
|
||||||
JsonSerializer serializer = new JsonSerializer();
|
JsonSerializer serializer = new JsonSerializer();
|
||||||
serializer.Error += delegate(object sender, ErrorEventArgs args)
|
serializer.Error += delegate(object sender, ErrorEventArgs args)
|
||||||
{
|
{
|
||||||
errors.Add(args.ErrorContext.Path + " - " + args.ErrorContext.Member + " - " + args.ErrorContext.Error.Message);
|
errors.Add(args.ErrorContext.Path + " - " + args.ErrorContext.Member + " - " + args.ErrorContext.Error.Message);
|
||||||
args.ErrorContext.Handled = true;
|
args.ErrorContext.Handled = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
serializer.Deserialize(new JsonTextReader(new StringReader(json)), typeof(int[]));
|
serializer.Deserialize(new JsonTextReader(new StringReader(json)), typeof (int[]));
|
||||||
|
|
||||||
Assert.AreEqual(2, errors.Count);
|
Assert.AreEqual(2, errors.Count);
|
||||||
Assert.AreEqual("[0] - 0 - Could not convert string to integer: a. Path '[0]', line 1, position 4.", errors[0]);
|
Assert.AreEqual("[0] - 0 - Could not convert string to integer: a. Path '[0]', line 1, position 4.", errors[0]);
|
||||||
@@ -441,12 +441,12 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
|
|
||||||
JsonSerializer serializer = new JsonSerializer();
|
JsonSerializer serializer = new JsonSerializer();
|
||||||
serializer.Error += delegate(object sender, ErrorEventArgs args)
|
serializer.Error += delegate(object sender, ErrorEventArgs args)
|
||||||
{
|
{
|
||||||
errors.Add(args.ErrorContext.Path + " - " + args.ErrorContext.Member + " - " + args.ErrorContext.Error.Message);
|
errors.Add(args.ErrorContext.Path + " - " + args.ErrorContext.Member + " - " + args.ErrorContext.Error.Message);
|
||||||
args.ErrorContext.Handled = true;
|
args.ErrorContext.Handled = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
serializer.Deserialize(new JsonTextReader(new StringReader(json)), typeof(int[,]));
|
serializer.Deserialize(new JsonTextReader(new StringReader(json)), typeof (int[,]));
|
||||||
|
|
||||||
Assert.AreEqual(2, errors.Count);
|
Assert.AreEqual(2, errors.Count);
|
||||||
Assert.AreEqual("[0][0] - 0 - Could not convert string to integer: a. Path '[0][0]', line 1, position 5.", errors[0]);
|
Assert.AreEqual("[0][0] - 0 - Could not convert string to integer: a. Path '[0][0]', line 1, position 5.", errors[0]);
|
||||||
@@ -457,15 +457,15 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
public void ErrorHandlingAndAvoidingRecursiveDepthError()
|
public void ErrorHandlingAndAvoidingRecursiveDepthError()
|
||||||
{
|
{
|
||||||
string json = "{'A':{'A':{'A':{'A':{'A':{}}}}}}";
|
string json = "{'A':{'A':{'A':{'A':{'A':{}}}}}}";
|
||||||
JsonSerializer serializer = new JsonSerializer() { };
|
JsonSerializer serializer = new JsonSerializer() {};
|
||||||
IList<string> errors = new List<string>();
|
IList<string> errors = new List<string>();
|
||||||
serializer.Error += (sender, e) =>
|
serializer.Error += (sender, e) =>
|
||||||
{
|
{
|
||||||
e.ErrorContext.Handled = true;
|
e.ErrorContext.Handled = true;
|
||||||
errors.Add(e.ErrorContext.Path);
|
errors.Add(e.ErrorContext.Path);
|
||||||
};
|
};
|
||||||
|
|
||||||
serializer.Deserialize<Nest>(new JsonTextReader(new StringReader(json)) { MaxDepth = 3 });
|
serializer.Deserialize<Nest>(new JsonTextReader(new StringReader(json)) {MaxDepth = 3});
|
||||||
|
|
||||||
Assert.AreEqual(1, errors.Count);
|
Assert.AreEqual(1, errors.Count);
|
||||||
Assert.AreEqual("A.A.A", errors[0]);
|
Assert.AreEqual("A.A.A", errors[0]);
|
||||||
@@ -530,13 +530,13 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
Dictionary<string, int[]> o = JsonConvert.DeserializeObject<Dictionary<string, int[]>>(
|
Dictionary<string, int[]> o = JsonConvert.DeserializeObject<Dictionary<string, int[]>>(
|
||||||
"{'badarray':[0,x,2],'goodarray':[0,1,2]}",
|
"{'badarray':[0,x,2],'goodarray':[0,1,2]}",
|
||||||
new JsonSerializerSettings
|
new JsonSerializerSettings
|
||||||
{
|
|
||||||
Error = (sender, arg) =>
|
|
||||||
{
|
{
|
||||||
errors.Add(arg.ErrorContext.Error.Message);
|
Error = (sender, arg) =>
|
||||||
arg.ErrorContext.Handled = true;
|
{
|
||||||
}
|
errors.Add(arg.ErrorContext.Error.Message);
|
||||||
});
|
arg.ErrorContext.Handled = true;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
Assert.IsNull(o);
|
Assert.IsNull(o);
|
||||||
|
|
||||||
@@ -547,48 +547,73 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
Assert.AreEqual("Unexpected character encountered while parsing value: x. Path 'badarray[0]', line 1, position 15.", errors[3]);
|
Assert.AreEqual("Unexpected character encountered while parsing value: x. Path 'badarray[0]', line 1, position 15.", errors[3]);
|
||||||
}
|
}
|
||||||
|
|
||||||
public class ThrowingReader : TextReader
|
[Test]
|
||||||
|
public void ErrorHandlingEndOfContent()
|
||||||
{
|
{
|
||||||
int _position = 0;
|
IList<string> errors = new List<string>();
|
||||||
static string element = "{\"FirstName\":\"Din\",\"LastName\":\"Rav\",\"Item\":{\"ItemName\":\"temp\"}}";
|
|
||||||
bool _firstRead = true;
|
|
||||||
bool _readComma = false;
|
|
||||||
|
|
||||||
public ThrowingReader()
|
const string input = "{\"events\":[{\"code\":64411,\"prio";
|
||||||
|
|
||||||
|
const int maxDepth = 256;
|
||||||
|
using (var jsonTextReader = new JsonTextReader(new StringReader(input)) {MaxDepth = maxDepth})
|
||||||
{
|
{
|
||||||
|
JsonSerializer jsonSerializer = JsonSerializer.Create(new JsonSerializerSettings {MaxDepth = maxDepth});
|
||||||
|
jsonSerializer.Error += (sender, e) =>
|
||||||
|
{
|
||||||
|
errors.Add(e.ErrorContext.Error.Message);
|
||||||
|
e.ErrorContext.Handled = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
jsonSerializer.Deserialize(jsonTextReader, typeof (LogMessage));
|
||||||
}
|
}
|
||||||
|
|
||||||
public override int Read(char[] buffer, int index, int count)
|
Assert.AreEqual(2, errors.Count);
|
||||||
|
Assert.AreEqual(@"Unterminated string. Expected delimiter: "". Path 'events[0].code', line 1, position 30.", errors[0]);
|
||||||
|
Assert.AreEqual(@"Unexpected end when deserializing object. Path 'events[0].code', line 1, position 30.", errors[1]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public class ThrowingReader : TextReader
|
||||||
|
{
|
||||||
|
private int _position = 0;
|
||||||
|
private static string element = "{\"FirstName\":\"Din\",\"LastName\":\"Rav\",\"Item\":{\"ItemName\":\"temp\"}}";
|
||||||
|
private bool _firstRead = true;
|
||||||
|
private bool _readComma = false;
|
||||||
|
|
||||||
|
public ThrowingReader()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
public override int Read(char[] buffer, int index, int count)
|
||||||
|
{
|
||||||
|
char[] temp = new char[buffer.Length];
|
||||||
|
int charsRead = 0;
|
||||||
|
if (_firstRead)
|
||||||
{
|
{
|
||||||
char[] temp = new char[buffer.Length];
|
charsRead = new StringReader("[").Read(temp, index, count);
|
||||||
int charsRead = 0;
|
_firstRead = false;
|
||||||
if (_firstRead)
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (_readComma)
|
||||||
{
|
{
|
||||||
charsRead = new StringReader("[").Read(temp, index, count);
|
charsRead = new StringReader(",").Read(temp, index, count);
|
||||||
_firstRead = false;
|
_readComma = false;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (_readComma)
|
charsRead = new StringReader(element).Read(temp, index, count);
|
||||||
{
|
_readComma = true;
|
||||||
charsRead = new StringReader(",").Read(temp, index, count);
|
|
||||||
_readComma = false;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
charsRead = new StringReader(element).Read(temp, index, count);
|
|
||||||
_readComma = true;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
_position += charsRead;
|
|
||||||
if (_position > 65536)
|
|
||||||
{
|
|
||||||
throw new Exception("too far");
|
|
||||||
}
|
|
||||||
Array.Copy(temp, index, buffer, index, charsRead);
|
|
||||||
return charsRead;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_position += charsRead;
|
||||||
|
if (_position > 65536)
|
||||||
|
{
|
||||||
|
throw new Exception("too far");
|
||||||
|
}
|
||||||
|
Array.Copy(temp, index, buffer, index, charsRead);
|
||||||
|
return charsRead;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -607,9 +632,18 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
[JsonObject]
|
[JsonObject]
|
||||||
public class MyTypeWithRequiredMembers
|
public class MyTypeWithRequiredMembers
|
||||||
{
|
{
|
||||||
[JsonProperty(Required = Required.AllowNull)]
|
[JsonProperty(Required = Required.AllowNull)] public string Required1;
|
||||||
public string Required1;
|
[JsonProperty(Required = Required.AllowNull)] public string Required2;
|
||||||
[JsonProperty(Required = Required.AllowNull)]
|
}
|
||||||
public string Required2;
|
|
||||||
|
public class LogMessage
|
||||||
|
{
|
||||||
|
public string DeviceId { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class LogEvent
|
||||||
|
{
|
||||||
|
public string Code { get; set; }
|
||||||
|
public int Priority { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1577,7 +1577,8 @@ To fix this error either change the environment to be fully trusted, change the
|
|||||||
|
|
||||||
while (reader.Depth > (initialDepth + 1))
|
while (reader.Depth > (initialDepth + 1))
|
||||||
{
|
{
|
||||||
reader.Read();
|
if (!reader.Read())
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user