LiRuochen_WorkFlow/Newtonsoft.Json
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

-Change reading schema references to ignore additional content after the $ref property

Browse Source
This commit is contained in:
JamesNK
2011-06-01 07:12:46 +00:00
parent 3997b601ff
commit 857d72530c
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs
+1 -1
View File
@@ -41,5 +41,5 @@ using System.Runtime.InteropServices;
// by using the '*' as shown below:
[assembly: AssemblyVersion("4.0.2.0")]
#if !PocketPC
[assembly: AssemblyFileVersion("4.0.2.13728")]
[assembly: AssemblyFileVersion("4.0.2.13801")]
#endif
Src/Newtonsoft.Json/Properties/AssemblyInfo.cs
+1 -1
View File
@@ -110,7 +110,7 @@ using System.Security;
// by using the '*' as shown below:
[assembly: AssemblyVersion("4.0.2.0")]
#if !PocketPC
[assembly: AssemblyFileVersion("4.0.2.13728")]
[assembly: AssemblyFileVersion("4.0.2.13801")]
#endif
[assembly: CLSCompliant(true)]
Src/Newtonsoft.Json/Schema/JsonSchemaBuilder.cs
+9 -1
View File
@@ -97,7 +97,15 @@ namespace Newtonsoft.Json.Schema
if (propertyName == JsonSchemaConstants.ReferencePropertyName)
{
string id = (string)_reader.Value;
_reader.Read();
// skip to the end of the current object
while (_reader.Read() && _reader.TokenType != JsonToken.EndObject)
{
if (_reader.TokenType == JsonToken.StartObject)
throw new Exception("Found StartObject within the schema reference with the Id '{0}'"
.FormatWith(CultureInfo.InvariantCulture, id));
}
JsonSchema referencedSchema = _resolver.GetSchema(id);
if (referencedSchema == null)
throw new Exception("Could not resolve schema reference for Id '{0}'.".FormatWith(CultureInfo.InvariantCulture, id));