Merge pull request #103 from razzmatazz/bugfix-nre-in-exceptionframe-cs

Fixes a NullReferenceException in ExceptionFrame.cs

Author: asbjornu

Makefile

@@ -9,4 +9,4 @@ restore:
 
 test: restore
 	xbuild "./src/SharpRaven.build"
-	mono --runtime=v4.0.30319 ./src/packages/NUnit.Runners.2.6.4/tools/nunit-console.exe ./src/tests/SharpRaven.UnitTests/bin/Release/net45/SharpRaven.UnitTests.dll -exclude=NuGet,NoMono -nodots
+	mono --debug --runtime=v4.0.30319 ./src/packages/NUnit.Runners.2.6.4/tools/nunit-console.exe ./src/tests/SharpRaven.UnitTests/bin/Release/net45/SharpRaven.UnitTests.dll -exclude=NuGet,NoMono -nodots

src/app/SharpRaven/Data/ExceptionFrame.cs

@@ -60,10 +60,24 @@ public ExceptionFrame(StackFrame frame)
             }
 
             var method = frame.GetMethod();
+            if (method != null)
+            {
+                Module = (method.DeclaringType != null) ? method.DeclaringType.FullName : null;
+                Function = method.Name;
+                Source = method.ToString();
+            }
+            else
+            {
+                // on some platforms (e.g. on mono), StackFrame.GetMethod() may return null
+                // e.g. for this stack frame:
+                //   at (wrapper dynamic-method) System.Object:lambda_method (System.Runtime.CompilerServices.Closure,object,object))
+
+                Module = "(unknown)";
+                Function = "(unknown)";
+                Source = "(unknown)";
+            }
+
             Filename = frame.GetFileName();
-            Module = (method.DeclaringType != null) ? method.DeclaringType.FullName : null;
-            Function = method.Name;
-            Source = method.ToString();
             LineNumber = lineNo;
             ColumnNumber = frame.GetFileColumnNumber();
         }
@@ -206,4 +220,4 @@ public override string ToString()
             return sb.ToString();
         }
     }
-}
+}

src/tests/SharpRaven.UnitTests/Data/ExceptionFrameTests.cs

@@ -0,0 +1,68 @@
+#region License
+
+// Copyright (c) 2016 The Sentry Team and individual contributors.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are permitted
+// provided that the following conditions are met:
+//
+//     1. Redistributions of source code must retain the above copyright notice, this list of
+//        conditions and the following disclaimer.
+//
+//     2. Redistributions in binary form must reproduce the above copyright notice, this list of
+//        conditions and the following disclaimer in the documentation and/or other materials
+//        provided with the distribution.
+//
+//     3. Neither the name of the Sentry nor the names of its contributors may be used to
+//        endorse or promote products derived from this software without specific prior written
+//        permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+// IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+// FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#endregion
+
+using System;
+using System.Diagnostics;
+using System.Reflection;
+
+using NUnit.Framework;
+
+using SharpRaven.Data;
+using SharpRaven.UnitTests.Utilities;
+
+namespace SharpRaven.UnitTests.Data
+{
+    internal class StackFrameWithNullMethod: StackFrame
+    {
+        public override MethodBase GetMethod()
+        {
+            return null;
+        }
+    }
+
+    [TestFixture]
+    public class ExceptionFrameTests
+    {
+        [Test]
+        public void Constructor_NullFrameMethod_DoesNotThrow()
+        {
+            // on some platforms (e.g. on mono), StackFrame.GetMethod() may return null
+            // e.g. for this stack frame:
+            //   at (wrapper dynamic-method) System.Object:lambda_method (System.Runtime.CompilerServices.Closure,object,object))
+
+            var stackFrame = new StackFrameWithNullMethod();
+            var frame = new ExceptionFrame(stackFrame);
+
+            Assert.AreEqual("(unknown)", frame.Module);
+            Assert.AreEqual("(unknown)", frame.Function);
+            Assert.AreEqual("(unknown)", frame.Source);
+        }
+    }
+}

src/tests/SharpRaven.UnitTests/SharpRaven.UnitTests.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -77,6 +77,7 @@
     <Compile Include="..\..\CommonAssemblyInfo.cs">
       <Link>Properties\CommonAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="Data\ExceptionFrameTests.cs" />
     <Compile Include="Data\JsonPacketFactoryTests.cs" />
     <Compile Include="Data\JsonPacketTests.cs" />
     <Compile Include="Data\SentryExceptionTests.cs" />
@@ -131,4 +132,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>