Merge pull request #133 from gregsdennis/memory-mgmt

Memory mgmt
gregsdennis · Jun 20, 2021 · e468de6 · e468de6
2 parents 6c15cb3 + 210e5d2
commit e468de6
Show file tree

Hide file tree

Showing 27 changed files with 88 additions and 46 deletions.
diff --git a/.github/semver_config.json b/.github/semver_config.json
@@ -2,7 +2,8 @@
 	"settings": {
 		"ruleOverrides": { },
 		"omitDisclaimer": true,
-		"includeHeader": true
+		"includeHeader": true,
+		"assumeChanges": true
 	},
 	"nuget": {
 		"repositoryUrl": "https://api.nuget.org/"

diff --git a/Json.More/Json.More.csproj b/Json.More/Json.More.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <PackageId>Json.More.Net</PackageId>
     <Authors>Greg Dennis</Authors>
-    <Version>1.4.2</Version>
+    <Version>1.4.3</Version>
     <Description>Provides extended functionality for the System.Text.Json namespace.</Description>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageProjectUrl>https://github.com/gregsdennis/json-everything</PackageProjectUrl>
@@ -14,7 +14,7 @@
     <PackageReleaseNotes>https://gregsdennis.github.io/json-everything/release-notes/json-more.html</PackageReleaseNotes>
     <LangVersion>latest</LangVersion>
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
-    <FileVersion>1.4.2.0</FileVersion>
+    <FileVersion>1.4.3.0</FileVersion>
     <DocumentationFile>Json.More.xml</DocumentationFile>
     <PackageIcon>json-logo-256.png</PackageIcon>
 	  <IncludeSymbols>true</IncludeSymbols>

diff --git a/Json.More/JsonElementExtensions.cs b/Json.More/JsonElementExtensions.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Text.Json;
 
@@ -145,8 +146,8 @@ public static string ToJsonString(this JsonElement element)
 		/// <remarks>This is a workaround for lack of native support in the System.Text.Json namespace.</remarks>
 		public static JsonElement AsJsonElement(this long value)
 		{
-			var doc = JsonDocument.Parse($"{value}");
-			return doc.RootElement;
+			using var doc = JsonDocument.Parse(value.ToString(CultureInfo.InvariantCulture));
+			return doc.RootElement.Clone();
 		}
 
 		/// <summary>
@@ -157,8 +158,8 @@ public static JsonElement AsJsonElement(this long value)
 		/// <remarks>This is a workaround for lack of native support in the System.Text.Json namespace.</remarks>
 		public static JsonElement AsJsonElement(this int value)
 		{
-			var doc = JsonDocument.Parse($"{value}");
-			return doc.RootElement;
+			using var doc = JsonDocument.Parse(value.ToString(CultureInfo.InvariantCulture));
+			return doc.RootElement.Clone();
 		}
 
 		/// <summary>
@@ -169,8 +170,8 @@ public static JsonElement AsJsonElement(this int value)
 		/// <remarks>This is a workaround for lack of native support in the System.Text.Json namespace.</remarks>
 		public static JsonElement AsJsonElement(this short value)
 		{
-			var doc = JsonDocument.Parse($"{value}");
-			return doc.RootElement;
+			using var doc = JsonDocument.Parse(value.ToString(CultureInfo.InvariantCulture));
+			return doc.RootElement.Clone();
 		}
 
 		/// <summary>
@@ -181,8 +182,8 @@ public static JsonElement AsJsonElement(this short value)
 		/// <remarks>This is a workaround for lack of native support in the System.Text.Json namespace.</remarks>
 		public static JsonElement AsJsonElement(this bool value)
 		{
-			var doc = JsonDocument.Parse($"{value.ToString().ToLower()}");
-			return doc.RootElement;
+			using var doc = JsonDocument.Parse(value ? "true" : "false");
+			return doc.RootElement.Clone();
 		}
 
 		/// <summary>
@@ -193,8 +194,8 @@ public static JsonElement AsJsonElement(this bool value)
 		/// <remarks>This is a workaround for lack of native support in the System.Text.Json namespace.</remarks>
 		public static JsonElement AsJsonElement(this decimal value)
 		{
-			var doc = JsonDocument.Parse($"{value}");
-			return doc.RootElement;
+			using var doc = JsonDocument.Parse(value.ToString(CultureInfo.InvariantCulture));
+			return doc.RootElement.Clone();
 		}
 
 		/// <summary>
@@ -205,8 +206,8 @@ public static JsonElement AsJsonElement(this decimal value)
 		/// <remarks>This is a workaround for lack of native support in the System.Text.Json namespace.</remarks>
 		public static JsonElement AsJsonElement(this double value)
 		{
-			var doc = JsonDocument.Parse($"{value}");
-			return doc.RootElement;
+			using var doc = JsonDocument.Parse(value.ToString(CultureInfo.InvariantCulture));
+			return doc.RootElement.Clone();
 		}
 
 		/// <summary>
@@ -217,8 +218,8 @@ public static JsonElement AsJsonElement(this double value)
 		/// <remarks>This is a workaround for lack of native support in the System.Text.Json namespace.</remarks>
 		public static JsonElement AsJsonElement(this float value)
 		{
-			var doc = JsonDocument.Parse($"{value}");
-			return doc.RootElement;
+			using var doc = JsonDocument.Parse(value.ToString(CultureInfo.InvariantCulture));
+			return doc.RootElement.Clone();
 		}
 
 		/// <summary>
@@ -229,8 +230,8 @@ public static JsonElement AsJsonElement(this float value)
 		/// <remarks>This is a workaround for lack of native support in the System.Text.Json namespace.</remarks>
 		public static JsonElement AsJsonElement(this string? value)
 		{
-			var doc = JsonDocument.Parse(JsonSerializer.Serialize(value));
-			return doc.RootElement;
+			using var doc = JsonDocument.Parse(JsonSerializer.Serialize(value));
+			return doc.RootElement.Clone();
 		}
 
 		/// <summary>
@@ -241,8 +242,8 @@ public static JsonElement AsJsonElement(this string? value)
 		/// <remarks>This is a workaround for lack of native support in the System.Text.Json namespace.</remarks>
 		public static JsonElement AsJsonElement(this IEnumerable<JsonElement> values)
 		{
-			var doc = JsonDocument.Parse($"[{string.Join(",", values.Select(v => v.ToJsonString()))}]");
-			return doc.RootElement;
+			using var doc = JsonDocument.Parse($"[{string.Join(",", values.Select(v => v.ToJsonString()))}]");
+			return doc.RootElement.Clone();
 		}
 
 		/// <summary>
@@ -253,8 +254,8 @@ public static JsonElement AsJsonElement(this IEnumerable<JsonElement> values)
 		/// <remarks>This is a workaround for lack of native support in the System.Text.Json namespace.</remarks>
 		public static JsonElement AsJsonElement(this IDictionary<string, JsonElement> values)
 		{
-			var doc = JsonDocument.Parse($"{{{string.Join(",", values.Select(v => $"{JsonSerializer.Serialize(v.Key)}:{v.Value.ToJsonString()}"))}}}");
-			return doc.RootElement;
+			using var doc = JsonDocument.Parse($"{{{string.Join(",", values.Select(v => $"{JsonSerializer.Serialize(v.Key)}:{v.Value.ToJsonString()}"))}}}");
+			return doc.RootElement.Clone();
 		}
 	}
 }
diff --git a/JsonLogic/JsonLogic.csproj b/JsonLogic/JsonLogic.csproj
@@ -14,9 +14,9 @@
     <PackageTags>json logic json-logic jsonlogic</PackageTags>
     <PackageReleaseNotes>https://gregsdennis.github.io/json-everything/release-notes/json-logic.html</PackageReleaseNotes>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>1.3.0</Version>
+    <Version>1.3.1</Version>
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
-    <FileVersion>1.3.0.0</FileVersion>
+    <FileVersion>1.3.1.0</FileVersion>
     <DocumentationFile>JsonLogic.xml</DocumentationFile>
 	  <IncludeSymbols>true</IncludeSymbols>
 	  <SymbolPackageFormat>snupkg</SymbolPackageFormat>

diff --git a/JsonLogic/Rule.cs b/JsonLogic/Rule.cs
@@ -75,7 +75,10 @@ public class LogicComponentConverter : JsonConverter<Rule>
 		public override Rule Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
 		{
 			if (reader.TokenType != JsonTokenType.StartObject)
-				return new LiteralRule(JsonDocument.ParseValue(ref reader).RootElement);
+			{
+				using var doc = JsonDocument.ParseValue(ref reader);
+				return new LiteralRule(doc.RootElement.Clone());
+			}
 
 			var data = JsonSerializer.Deserialize<Dictionary<string, ArgumentCollection>>(ref reader, options);
 

diff --git a/JsonLogic/RuleExtensions.cs b/JsonLogic/RuleExtensions.cs
@@ -7,14 +7,22 @@ namespace Json.Logic
 	/// </summary>
 	public static class RuleExtensions
 	{
+		private static readonly JsonElement _nullElement;
+
+		static RuleExtensions()
+		{
+			using var doc = JsonDocument.Parse("null");
+			_nullElement = doc.RootElement.Clone();
+		}
+
 		/// <summary>
 		/// Calls <see cref="Rule.Apply(JsonElement)"/> with no data.
 		/// </summary>
 		/// <param name="rule">The rule.</param>
 		/// <returns>The result.</returns>
 		public static JsonElement Apply(this Rule rule)
 		{
-			return rule.Apply(JsonDocument.Parse("null").RootElement);
+			return rule.Apply(_nullElement);
 		}
 	}
 }
diff --git a/JsonLogic/Rules/ReduceRule.cs b/JsonLogic/Rules/ReduceRule.cs
@@ -40,7 +40,8 @@ public override JsonElement Apply(JsonElement data)
 					Current = element,
 					Accumulator = accumulator
 				};
-				var item = JsonDocument.Parse(JsonSerializer.Serialize(intermediary, _options)).RootElement;
+				using var doc = JsonDocument.Parse(JsonSerializer.Serialize(intermediary, _options));
+				var item = doc.RootElement.Clone();
 
 				accumulator = _rule.Apply(item);
 			}

diff --git a/JsonPatch/EditableJsonElement.cs b/JsonPatch/EditableJsonElement.cs
@@ -42,7 +42,8 @@ public EditableJsonElement(JsonElement raw)
 
 		public JsonElement ToElement()
 		{
-			return JsonDocument.Parse(ToString()).RootElement;
+			using var doc = JsonDocument.Parse(ToString());
+			return doc.RootElement.Clone();
 		}
 
 		public override string ToString()

diff --git a/JsonPatch/JsonPatch.csproj b/JsonPatch/JsonPatch.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <RootNamespace>Json.Patch</RootNamespace>
-    <Version>1.0.4</Version>
+    <Version>1.0.5</Version>
     <PackageId>JsonPatch.Net</PackageId>
     <Authors>Greg Dennis</Authors>
     <Company>Greg Dennis</Company>
@@ -18,7 +18,7 @@
     <PackageIcon>json-logo-256.png</PackageIcon>
     <PackageReleaseNotes>https://gregsdennis.github.io/json-everything/release-notes/json-patch.html</PackageReleaseNotes>
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
-    <FileVersion>1.0.4.0</FileVersion>
+    <FileVersion>1.0.5.0</FileVersion>
     <DocumentationFile>JsonPatch.xml</DocumentationFile>
 	  <IncludeSymbols>true</IncludeSymbols>
 	  <SymbolPackageFormat>snupkg</SymbolPackageFormat>

diff --git a/JsonPath/JsonPath.csproj b/JsonPath/JsonPath.csproj
@@ -13,8 +13,8 @@
     <PackageIcon>json-logo-256.png</PackageIcon>
     <PackageTags>json-path jsonpath query json</PackageTags>
     <PackageReleaseNotes>https://gregsdennis.github.io/json-everything/release-notes/json-path.html</PackageReleaseNotes>
-    <Version>0.1.6</Version>
-    <FileVersion>0.1.6.0</FileVersion>
+    <Version>0.1.7</Version>
+    <FileVersion>0.1.7.0</FileVersion>
     <AssemblyVersion>0.1.0.0</AssemblyVersion>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <DocumentationFile>JsonPath.Net.xml</DocumentationFile>

diff --git a/JsonPath/PropertyNameIndex.cs b/JsonPath/PropertyNameIndex.cs
@@ -59,7 +59,8 @@ internal static bool TryParse(ReadOnlySpan<char> span, ref int i, [NotNullWhen(t
 			{
 				if (start == '\'') 
 					key = key.Replace("\\'", "'").Replace("\"", "\\\"");
-				key = JsonDocument.Parse($"\"{key}\"").RootElement.GetString();
+				using var doc = JsonDocument.Parse($"\"{key}\"");
+				key = doc.RootElement.GetString();
 			}
 			catch
 			{

diff --git a/JsonPath/SpanExtensions.cs b/JsonPath/SpanExtensions.cs
@@ -208,7 +208,8 @@ public static bool TryParseJsonElement(this ReadOnlySpan<char> span, ref int i,
 				var block = span[i..end];
 				if (block[0] == '\'' && block[^1] == '\'')
 					block = $"\"{block[1..^1].ToString()}\"".AsSpan();
-				element = JsonDocument.Parse(block.ToString()).RootElement.Clone();
+				using var doc = JsonDocument.Parse(block.ToString());
+				element = doc.RootElement.Clone();
 				i = end;
 				return true;
 			}

diff --git a/JsonSchema/ConstKeyword.cs b/JsonSchema/ConstKeyword.cs
@@ -77,7 +77,8 @@ internal class ConstKeywordJsonConverter : JsonConverter<ConstKeyword>
 	{
 		public override ConstKeyword Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
 		{
-			var element = JsonDocument.ParseValue(ref reader).RootElement;
+			using var document = JsonDocument.ParseValue(ref reader);
+			var element = document.RootElement;
 
 			return new ConstKeyword(element);
 		}

diff --git a/JsonSchema/DefaultKeyword.cs b/JsonSchema/DefaultKeyword.cs
@@ -76,7 +76,8 @@ internal class DefaultKeywordJsonConverter : JsonConverter<DefaultKeyword>
 	{
 		public override DefaultKeyword Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
 		{
-			var element = JsonDocument.ParseValue(ref reader).RootElement;
+			using var document = JsonDocument.ParseValue(ref reader);
+			var element = document.RootElement;
 
 			return new DefaultKeyword(element);
 		}

diff --git a/JsonSchema/EnumKeyword.cs b/JsonSchema/EnumKeyword.cs
@@ -89,7 +89,7 @@ internal class EnumKeywordJsonConverter : JsonConverter<EnumKeyword>
 	{
 		public override EnumKeyword Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
 		{
-			var document = JsonDocument.ParseValue(ref reader);
+			using var document = JsonDocument.ParseValue(ref reader);
 
 			if (document.RootElement.ValueKind != JsonValueKind.Array)
 				throw new JsonException("Expected array");

diff --git a/JsonSchema/ExamplesKeyword.cs b/JsonSchema/ExamplesKeyword.cs
@@ -88,7 +88,7 @@ internal class ExamplesKeywordJsonConverter : JsonConverter<ExamplesKeyword>
 	{
 		public override ExamplesKeyword Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
 		{
-			var document = JsonDocument.ParseValue(ref reader);
+			using var document = JsonDocument.ParseValue(ref reader);
 
 			if (document.RootElement.ValueKind != JsonValueKind.Array)
 				throw new JsonException("Expected array");

diff --git a/JsonSchema/JsonSchema.cs b/JsonSchema/JsonSchema.cs
@@ -383,7 +383,8 @@ public override JsonSchema Read(ref Utf8JsonReader reader, Type typeToConvert, J
 						var keywordType = SchemaKeywordRegistry.GetImplementationType(keyword);
 						if (keywordType == null)
 						{
-							var element = JsonDocument.ParseValue(ref reader).RootElement;
+							using var document = JsonDocument.ParseValue(ref reader);
+							var element = document.RootElement;
 							otherData[keyword] = element.Clone();
 							break;
 						}

diff --git a/JsonSchema/JsonSchema.csproj b/JsonSchema/JsonSchema.csproj
@@ -13,8 +13,8 @@
     <PackageProjectUrl>https://github.com/gregsdennis/json-everything</PackageProjectUrl>
     <RepositoryUrl>https://github.com/gregsdennis/json-everything</RepositoryUrl>
     <PackageTags>json-schema validation schema json</PackageTags>
-    <Version>1.10.3</Version>
-    <FileVersion>1.10.3.0</FileVersion>
+    <Version>1.10.4</Version>
+    <FileVersion>1.10.4.0</FileVersion>
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <AssemblyName>JsonSchema.Net</AssemblyName>

diff --git a/JsonSchema/RequiredKeyword.cs b/JsonSchema/RequiredKeyword.cs
@@ -109,7 +109,7 @@ internal class RequiredKeywordJsonConverter : JsonConverter<RequiredKeyword>
 	{
 		public override RequiredKeyword Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
 		{
-			var document = JsonDocument.ParseValue(ref reader);
+			using var document = JsonDocument.ParseValue(ref reader);
 
 			if (document.RootElement.ValueKind != JsonValueKind.Array)
 				throw new JsonException("Expected array");

diff --git a/JsonSchema/SchemaKeyword.cs b/JsonSchema/SchemaKeyword.cs
@@ -64,7 +64,8 @@ public void Validate(ValidationContext context)
 			}
 
 			context.Log(() => "Validating against meta-schema.");
-			var schemaAsJson = JsonDocument.Parse(JsonSerializer.Serialize(context.LocalSchema)).RootElement;
+			using var document = JsonDocument.Parse(JsonSerializer.Serialize(context.LocalSchema));
+			var schemaAsJson = document.RootElement;
 			var newOptions = ValidationOptions.From(context.Options);
 			newOptions.ValidateMetaSchema = false;
 			var results = metaSchema.Validate(schemaAsJson, newOptions);

diff --git a/JsonSchema/SchemaKeywordRegistry.cs b/JsonSchema/SchemaKeywordRegistry.cs
@@ -30,7 +30,8 @@ static SchemaKeywordRegistry()
 					.Select(t => new {Type = t, Keyword = t.GetCustomAttribute<SchemaKeywordAttribute>().Name})
 					.ToDictionary(k => k.Keyword, k => k.Type));
 
-			var nullElement = JsonDocument.Parse("null").RootElement;
+			using var document = JsonDocument.Parse("null");
+			var nullElement = document.RootElement;
 			_nullKeywords = new ConcurrentDictionary<Type, IJsonSchemaKeyword>
 			{
 				[typeof(ConstKeyword)] = new ConstKeyword(nullElement),

diff --git a/docs_source/release-notes/json-logic.md b/docs_source/release-notes/json-logic.md
@@ -1,3 +1,7 @@
+# [1.3.1](https://github.com/gregsdennis/json-everything/pull/133)
+
+[#132](https://github.com/gregsdennis/json-everything/pull/132) - Fixed some memory management issues around `JsonDocument` and `JsonElement`.  Thanks to [@ddunkin](https://github.com/ddunkin) for finding and fixing these.
+
 # [1.3.0](https://github.com/gregsdennis/json-everything/pull/92)
 
 - Exposed `JsonElementExtensions` so that it can be used in custom rules.

diff --git a/docs_source/release-notes/json-more.md b/docs_source/release-notes/json-more.md
@@ -1,3 +1,7 @@
+# [1.4.3](https://github.com/gregsdennis/json-everything/pull/133)
+
+[#132](https://github.com/gregsdennis/json-everything/pull/132) - Fixed some memory management issues around `JsonDocument` and `JsonElement`.  Thanks to [@ddunkin](https://github.com/ddunkin) for finding and fixing these.
+
 # [1.4.2](https://github.com/gregsdennis/json-everything/pull/105)
 
 Fixes potential race condition in `EnumStringConverter`.  Credit to [@jaysvoboda](https://github.com/jaysvoboda) for finding and fixing this.

diff --git a/docs_source/release-notes/json-patch.md b/docs_source/release-notes/json-patch.md
@@ -1,3 +1,7 @@
+# [1.0.6](https://github.com/gregsdennis/json-everything/pull/133)
+
+[#132](https://github.com/gregsdennis/json-everything/pull/132) - Fixed some memory management issues around `JsonDocument` and `JsonElement`.  Thanks to [@ddunkin](https://github.com/ddunkin) for finding and fixing these.
+
 # [1.0.5](https://github.com/gregsdennis/json-everything/pull/75)
 
 Added support for nullable reference types.

diff --git a/docs_source/release-notes/json-path.md b/docs_source/release-notes/json-path.md
@@ -1,3 +1,7 @@
+# [0.1.7](https://github.com/gregsdennis/json-everything/pull/133)
+
+[#132](https://github.com/gregsdennis/json-everything/pull/132) - Fixed some memory management issues around `JsonDocument` and `JsonElement`.  Thanks to [@ddunkin](https://github.com/ddunkin) for finding and fixing these.
+
 # [0.1.6](https://github.com/gregsdennis/json-everything/pull/122)
 
 Updated expression parsing to handle whitespace better.

diff --git a/docs_source/release-notes/json-pointer.md b/docs_source/release-notes/json-pointer.md
@@ -1,6 +1,6 @@
 # [1.3.3](https://github.com/gregsdennis/json-everything/pull/130)
 
-[#123](https://github.com/gregsdennis/json-everything/pull/123) Removed a copy/paste error that shows up while deserializing relative pointers.  Thanks to [@bastiaantenklooster](https://github.com/bastiaantenklooster) for finding this and creating a PR to fix it.
+[#123](https://github.com/gregsdennis/json-everything/pull/123) - Removed a copy/paste error that shows up while deserializing relative pointers.  Thanks to [@bastiaantenklooster](https://github.com/bastiaantenklooster) for finding this and creating a PR to fix it.
 
 # [1.3.2](https://github.com/gregsdennis/json-everything/pull/75)
 

diff --git a/docs_source/release-notes/json-schema.md b/docs_source/release-notes/json-schema.md
@@ -1,3 +1,7 @@
+# [1.10.4](https://github.com/gregsdennis/json-everything/pull/133)
+
+[#132](https://github.com/gregsdennis/json-everything/pull/132) - Fixed some memory management issues around `JsonDocument` and `JsonElement`.  Thanks to [@ddunkin](https://github.com/ddunkin) for finding and fixing these.
+
 # [1.10.3](https://github.com/gregsdennis/json-everything/pull/120)
 
 Added overload for `ExitKeyword` logging extension to pull the validition result from the context rather than having to pass it in.