Null check when attempting to send null exception.

MindscapeHQ · Jul 28, 2014 · 78a358d · 78a358d
1 parent fe97d97
commit 78a358d
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 7 deletions.
diff --git a/Mindscape.Raygun4Net.Tests/RaygunClientTests.cs b/Mindscape.Raygun4Net.Tests/RaygunClientTests.cs
@@ -164,6 +164,13 @@ public void DontStripIfNoInnerException()
       Assert.IsNull(message.Details.Error.InnerError);
     }
 
+    [Test]
+    public void DontStripNull()
+    {
+      RaygunMessage message = _client.ExposeBuildMessage(null);
+      Assert.IsNull(message.Details.Error);
+    }
+
     [Test]
     public void StripMultipleWrapperExceptions()
     {

diff --git a/Mindscape.Raygun4Net.WinRT/RaygunClient.cs b/Mindscape.Raygun4Net.WinRT/RaygunClient.cs
@@ -200,7 +200,7 @@ private RaygunMessage BuildMessage(Exception exception, IList<string> tags, IDic
 
     private static Exception StripWrapperExceptions(Exception exception)
     {
-      if (_wrapperExceptions.Any(wrapperException => exception.GetType() == wrapperException && exception.InnerException != null))
+      if (exception != null && _wrapperExceptions.Any(wrapperException => exception.GetType() == wrapperException && exception.InnerException != null))
       {
         return StripWrapperExceptions(exception.InnerException);
       }

diff --git a/Mindscape.Raygun4Net.WindowsPhone/RaygunClient.cs b/Mindscape.Raygun4Net.WindowsPhone/RaygunClient.cs
@@ -505,7 +505,7 @@ private RaygunMessage BuildMessage(Exception exception, IList<string> tags, IDic
 
     private static Exception StripWrapperExceptions(Exception exception)
     {
-      if (_wrapperExceptions.Any(wrapperException => exception.GetType() == wrapperException && exception.InnerException != null))
+      if (exception != null && _wrapperExceptions.Any(wrapperException => exception.GetType() == wrapperException && exception.InnerException != null))
       {
         return StripWrapperExceptions(exception.InnerException);
       }

diff --git a/Mindscape.Raygun4Net.WindowsStore/RaygunClient.cs b/Mindscape.Raygun4Net.WindowsStore/RaygunClient.cs
@@ -449,7 +449,7 @@ private string PackageVersion
 
     private static Exception StripWrapperExceptions(Exception exception)
     {
-      if (_wrapperExceptions.Any(wrapperException => exception.GetType() == wrapperException && exception.InnerException != null))
+      if (exception != null && _wrapperExceptions.Any(wrapperException => exception.GetType() == wrapperException && exception.InnerException != null))
       {
         return StripWrapperExceptions(exception.InnerException);
       }

diff --git a/Mindscape.Raygun4Net.Xamarin.Android/RaygunClient.cs b/Mindscape.Raygun4Net.Xamarin.Android/RaygunClient.cs
@@ -243,7 +243,7 @@ internal RaygunMessage BuildMessage(Exception exception, IList<string> tags, IDi
 
     private static Exception StripWrapperExceptions(Exception exception)
     {
-      if (_wrapperExceptions.Any(wrapperException => exception.GetType() == wrapperException && exception.InnerException != null))
+      if (exception != null && _wrapperExceptions.Any(wrapperException => exception.GetType() == wrapperException && exception.InnerException != null))
       {
         return StripWrapperExceptions(exception.InnerException);
       }

diff --git a/Mindscape.Raygun4Net.Xamarin.iOS/RaygunClient.cs b/Mindscape.Raygun4Net.Xamarin.iOS/RaygunClient.cs
@@ -235,7 +235,7 @@ internal RaygunMessage BuildMessage(Exception exception, IList<string> tags, IDi
 
     private static Exception StripWrapperExceptions(Exception exception)
     {
-      if (_wrapperExceptions.Any(wrapperException => exception.GetType() == wrapperException && exception.InnerException != null))
+      if (exception != null && _wrapperExceptions.Any(wrapperException => exception.GetType() == wrapperException && exception.InnerException != null))
       {
         return StripWrapperExceptions(exception.InnerException);
       }

diff --git a/Mindscape.Raygun4Net/RaygunClient.cs b/Mindscape.Raygun4Net/RaygunClient.cs
@@ -290,7 +290,7 @@ protected RaygunMessage BuildMessage(Exception exception, IList<string> tags, ID
 
     private static Exception StripWrapperExceptions(Exception exception)
     {
-      if (_wrapperExceptions.Any(wrapperException => exception.GetType() == wrapperException && exception.InnerException != null))
+      if (exception != null && _wrapperExceptions.Any(wrapperException => exception.GetType() == wrapperException && exception.InnerException != null))
       {
         return StripWrapperExceptions(exception.InnerException);
       }

diff --git a/Mindscape.Raygun4Net2.Tests/RaygunClientTests.cs b/Mindscape.Raygun4Net2.Tests/RaygunClientTests.cs
@@ -166,6 +166,13 @@ public void DontStripIfNoInnerException()
       Assert.IsNull(message.Details.Error.InnerError);
     }
 
+    [Test]
+    public void DontStripNull()
+    {
+      RaygunMessage message = _client.ExposeBuildMessage(null);
+      Assert.IsNull(message.Details.Error);
+    }
+
     [Test]
     public void StripMultipleWrapperExceptions()
     {

diff --git a/Mindscape.Raygun4Net2/RaygunClient.cs b/Mindscape.Raygun4Net2/RaygunClient.cs
@@ -257,7 +257,7 @@ protected RaygunMessage BuildMessage(Exception exception, IList<string> tags, ID
 
     private static Exception StripWrapperExceptions(Exception exception)
     {
-      if (_wrapperExceptions.Contains(exception.GetType()) && exception.InnerException != null)
+      if (exception != null && _wrapperExceptions.Contains(exception.GetType()) && exception.InnerException != null)
       {
         return StripWrapperExceptions(exception.InnerException);
       }