From edb2fbe85d269a8078e937c79b2f78bb8f828ffa Mon Sep 17 00:00:00 2001
From: Harald Csaszar <harald.csaszar@pixelcloudgames.com>
Date: Tue, 22 Jan 2019 11:27:47 +0100
Subject: [PATCH] [unity] Added using and finally-dispose guards around all
 stream instances, see #1260.

---
 .../Editor/SpineEditorUtilities.cs            | 47 ++++++++++++-------
 .../Asset Types/SkeletonDataAsset.cs          | 11 +++--
 2 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineEditorUtilities.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineEditorUtilities.cs
index 61e86e711..89b2aaa77 100644
--- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineEditorUtilities.cs
+++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineEditorUtilities.cs
@@ -514,17 +514,24 @@ namespace Spine.Unity.Editor {
 
 				TextReader reader = null;
 				TextAsset spineJson = AssetDatabase.LoadAssetAtPath<TextAsset>(skeletonDataPath);
-				if (spineJson != null) {
-					reader = new StringReader(spineJson.text);
+				Dictionary<string, object> root = null;
+				try {
+					if (spineJson != null) {
+						reader = new StringReader(spineJson.text);
+					}
+					else {
+						// On a "Reimport All" the order of imports can be wrong, thus LoadAssetAtPath() above could return null.
+						// as a workaround, we provide a fallback reader.
+						reader = new StreamReader(skeletonDataPath);
+					}
+					root = Json.Deserialize(reader) as Dictionary<string, object>;
 				}
-				else {
-					// On a "Reimport All" the order of imports can be wrong, thus LoadAssetAtPath() above could return null.
-					// as a workaround, we provide a fallback reader.
-					reader = new StreamReader(skeletonDataPath);
+				finally {
+					if (reader != null)
+						reader.Dispose();
 				}
-				var root = Json.Deserialize(reader) as Dictionary<string, object>;
 
-				if (!root.ContainsKey("skins"))
+				if (root == null || !root.ContainsKey("skins"))
 					return requiredPaths;
 
 				foreach (var skin in (Dictionary<string, object>)root["skins"]) {
@@ -566,15 +573,21 @@ namespace Spine.Unity.Editor {
 				SkeletonBinary binary = new SkeletonBinary(new AtlasRequirementLoader(requiredPaths));
 				Stream input = null;
 				TextAsset data = AssetDatabase.LoadAssetAtPath<TextAsset>(skeletonDataPath);
-				if (data == null) {
-					// On a "Reimport All" the order of imports can be wrong, thus LoadAssetAtPath() above could return null.
-					// as a workaround, we provide a fallback reader.
-					input = File.Open(skeletonDataPath, FileMode.Open, FileAccess.Read);
+				try {
+					if (data != null) {
+						input = new MemoryStream(data.bytes);
+					}
+					else {
+						// On a "Reimport All" the order of imports can be wrong, thus LoadAssetAtPath() above could return null.
+						// as a workaround, we provide a fallback reader.
+						input = File.Open(skeletonDataPath, FileMode.Open, FileAccess.Read);
+					}
+					binary.ReadSkeletonData(input);
 				}
-				else {
-					input = new MemoryStream(data.bytes);
+				finally {
+					if (input != null)
+						input.Dispose();
 				}
-				binary.ReadSkeletonData(input);
 				binary = null;
 			}
 
@@ -1000,7 +1013,9 @@ namespace Spine.Unity.Editor {
 				int[][] compatibleVersions;
 				if (asset.name.Contains(".skel")) {
 					try {
-						rawVersion = SkeletonBinary.GetVersionString(new MemoryStream(asset.bytes));
+						using (var memStream = new MemoryStream(asset.bytes)) {
+							rawVersion = SkeletonBinary.GetVersionString(memStream);
+						}
 						isSpineData = !(string.IsNullOrEmpty(rawVersion));
 						compatibleVersions = compatibleBinaryVersions;
 					} catch (System.Exception e) {
diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Asset Types/SkeletonDataAsset.cs b/spine-unity/Assets/Spine/Runtime/spine-unity/Asset Types/SkeletonDataAsset.cs
index fe2f90b12..8069c0070 100644
--- a/spine-unity/Assets/Spine/Runtime/spine-unity/Asset Types/SkeletonDataAsset.cs	
+++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Asset Types/SkeletonDataAsset.cs	
@@ -219,11 +219,12 @@ namespace Spine.Unity {
 		}
 
 		internal static SkeletonData ReadSkeletonData (byte[] bytes, AttachmentLoader attachmentLoader, float scale) {
-			var input = new MemoryStream(bytes);
-			var binary = new SkeletonBinary(attachmentLoader) {
-				Scale = scale
-			};
-			return binary.ReadSkeletonData(input);
+			using (var input = new MemoryStream(bytes)) {
+				var binary = new SkeletonBinary(attachmentLoader) {
+					Scale = scale
+				};
+				return binary.ReadSkeletonData(input);
+			}
 		}
 
 		internal static SkeletonData ReadSkeletonData (string text, AttachmentLoader attachmentLoader, float scale) {