Nil friendly

Geeksltd · Mar 17, 2024 · 280cacd · 280cacd
1 parent 5539773
commit 280cacd
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/Olive/-Extensions/Exception.cs b/Olive/-Extensions/Exception.cs
@@ -111,9 +111,11 @@ public static string ToFullMessage(this Exception @this, string additionalMessag
                     continue;
                 }
 
-                resultBuilder.AppendLine(err.Message);
+                // NSErrorException.Message may result in a null reference exception!
+                try { resultBuilder.AppendLineIf(err.Message); }
+                catch { }
 
-                if (includeData && err.Data != null && err.Data.Count > 0)
+                if (includeData && err.Data?.Count > 0)
                 {
                     resultBuilder.AppendLine("\r\nException Data:\r\n{");
 
@@ -123,9 +125,9 @@ public static string ToFullMessage(this Exception @this, string additionalMessag
                     resultBuilder.AppendLine("}");
                 }
 
-                if (err is ReflectionTypeLoadException)
+                if (err is ReflectionTypeLoadException refErr)
                 {
-                    foreach (var loaderEx in (err as ReflectionTypeLoadException).LoaderExceptions)
+                    foreach (var loaderEx in refErr.LoaderExceptions)
                         resultBuilder.AppendLine("Type load exception: " + loaderEx.ToFullMessage());
                 }
 
@@ -142,13 +144,16 @@ public static string ToFullMessage(this Exception @this, string additionalMessag
                 }
             }
 
-            var stack = @this.GetUsefulStack().TrimOrEmpty();
-
-            if (includeStackTrace && stack.HasValue())
+            if (includeStackTrace)
             {
-                var stackLines = stack.ToLines();
-                stackLines = stackLines.Except(l => l.Trim().StartsWith("at System.Data.")).ToArray();
-                resultBuilder.AppendLine(stackLines.ToString("\r\n\r\n").WithPrefix("\r\n--------------------------------------\r\nSTACK TRACE:\r\n\r\n"));
+                var stack = @this.GetUsefulStack().TrimOrEmpty();
+
+                if (stack.HasValue())
+                {
+                    var stackLines = stack.ToLines();
+                    stackLines = stackLines.Except(l => l.Trim().StartsWith("at System.Data.")).ToArray();
+                    resultBuilder.AppendLine(stackLines.ToString("\r\n\r\n").WithPrefix("\r\n--------------------------------------\r\nSTACK TRACE:\r\n\r\n"));
+                }
             }
 
             return resultBuilder.ToString();
@@ -159,7 +164,7 @@ public static string GetUsefulStack(this Exception @this)
             if (@this.InnerException == null) return @this.StackTrace;
 
             if (@this is TargetInvocationException || @this is AggregateException)
-                return @this.InnerException.GetUsefulStack();
+                return @this.InnerException?.GetUsefulStack() ?? @this.StackTrace;
 
             return @this.StackTrace;
         }

diff --git a/Olive/Olive.csproj b/Olive/Olive.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.361.0</Version>
+		<Version>2.1.362.0</Version>
 		<OutputType>Library</OutputType>
 		<LangVersion>latest</LangVersion>
 		<!--<PackageId>Olive</PackageId>-->