-Fixed infinite loop error caused by error handling at the end of JSON content

This commit is contained in:
James Newton-King
2012-08-02 20:50:44 +12:00
parent 4e4fdde9c4
commit be82ab9f0b
3 changed files with 116 additions and 74 deletions
+8 -1
View File
@@ -276,13 +276,20 @@
<content>
<!-- Uncomment this to create a sub-section outline
<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
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
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
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>
</section>
@@ -547,12 +547,38 @@ namespace Newtonsoft.Json.Tests.Serialization
Assert.AreEqual("Unexpected character encountered while parsing value: x. Path 'badarray[0]', line 1, position 15.", errors[3]);
}
[Test]
public void ErrorHandlingEndOfContent()
{
IList<string> errors = new List<string>();
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));
}
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
{
int _position = 0;
static string element = "{\"FirstName\":\"Din\",\"LastName\":\"Rav\",\"Item\":{\"ItemName\":\"temp\"}}";
bool _firstRead = true;
bool _readComma = false;
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()
{
@@ -590,7 +616,6 @@ namespace Newtonsoft.Json.Tests.Serialization
return charsRead;
}
}
}
public class ErrorPerson
{
@@ -607,9 +632,18 @@ namespace Newtonsoft.Json.Tests.Serialization
[JsonObject]
public class MyTypeWithRequiredMembers
{
[JsonProperty(Required = Required.AllowNull)]
public string Required1;
[JsonProperty(Required = Required.AllowNull)]
public string Required2;
[JsonProperty(Required = Required.AllowNull)] public string Required1;
[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))
{
reader.Read();
if (!reader.Read())
break;
}
}
}