fix NRE in CommsInterface for .NET

Sparksteam · Mar 11, 2015 · 506a544 · 506a544
1 parent 3940bbc
commit 506a544
Show file tree

Hide file tree

Showing 15 changed files with 39 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 _This changelog refers to nuget package releases._
 
+#### 1.1.5 (2015-03-11)
+
+Bugfixes:
+
+- Fixed a `NullReferenceException` that could occur in `CommsInterface.GetAllInterfacesAsync` if an interface had no IPv4 unicast address. 
+
 #### 1.1.4 (2015-02-09)
 
 Features:
@@ -34,7 +40,7 @@ Other:
 
 Bugfixes:
 
-  - Fixed a NullReferenceException in the .NET abstraction that would occur if a ````UdpSocketReceiver````'s ````SendToAsync```` method was called before ````StartListeningAsync````.
+  - Fixed a `NullReferenceException` in the .NET abstraction that would occur if a ````UdpSocketReceiver````'s ````SendToAsync```` method was called before ````StartListeningAsync````.
 
 #### 1.0.0.0 (2014-12-03)
 

diff --git a/Sockets.Plugin.nuspec b/Sockets.Plugin.nuspec
@@ -3,7 +3,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata minClientVersion="2.8.1">
     <id>rda.SocketsForPCL</id>
-    <version>1.1.4</version>
+    <version>1.1.5</version>
     <title>Sockets Plugin for Xamarin and Windows (PCL)</title>
     <authors>Ryan Davis</authors>
     <owners>Ryan Davis</owners>
@@ -13,6 +13,12 @@
     <copyright>2015 Ryan Davis</copyright>
     <iconUrl>https://raw.githubusercontent.com/rdavisau/sockets-for-pcl/master/_meta/icon/icon.png</iconUrl>
     <releaseNotes>
+1.1.5 (2015-03-11)
+
+Bugfixes:
+
+- Fixed a `NullReferenceException` that could occur in `CommsInterface.GetAllInterfacesAsync` if an interface had no IPv4 unicast address. 
+
 1.1.4 (2015-02-09)
 
 Features:

diff --git a/Sockets.sln.DotSettings b/Sockets.sln.DotSettings
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PCL/@EntryIndexedValue">PCL</s:String></wpf:ResourceDictionary>
diff --git a/Sockets/Sockets.Implementation.NET/CommsInterface.cs b/Sockets/Sockets.Implementation.NET/CommsInterface.cs
@@ -101,7 +101,7 @@ internal static CommsInterface FromNativeInterface(NetworkInterface nativeInterf
                     .Select(a => a.Address.ToString())
                     .FirstOrDefault();
 
-            var netmask = GetSubnetMask(ip); // implemented natively for each .NET platform
+            var netmask = ip != null ? GetSubnetMask(ip) : null; // implemented natively for each .NET platform
 
             var broadcast = (ip != null && netmask != null) ? ip.Address.GetBroadcastAddress(netmask).ToString() : null;
 

diff --git a/Sockets/Sockets.Implementation.NET/Properties/AssemblyInfo.cs b/Sockets/Sockets.Implementation.NET/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("1.1.4")]
-[assembly: AssemblyFileVersion("1.1.4")]
+[assembly: AssemblyVersion("1.1.5")]
+[assembly: AssemblyFileVersion("1.1.5")]
diff --git a/Sockets/Sockets.Implementation.WinRT/Properties/AssemblyInfo.cs b/Sockets/Sockets.Implementation.WinRT/Properties/AssemblyInfo.cs
@@ -26,5 +26,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("1.1.4")]
-[assembly: AssemblyFileVersion("1.1.4")]
+[assembly: AssemblyVersion("1.1.5")]
+[assembly: AssemblyFileVersion("1.1.5")]
diff --git a/Sockets/Sockets.Plugin.Abstractions/Properties/AssemblyInfo.cs b/Sockets/Sockets.Plugin.Abstractions/Properties/AssemblyInfo.cs
@@ -26,5 +26,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("1.1.4")]
-[assembly: AssemblyFileVersion("1.1.4")]
+[assembly: AssemblyVersion("1.1.5")]
+[assembly: AssemblyFileVersion("1.1.5")]
diff --git a/Sockets/Sockets.Plugin.Android/Properties/AssemblyInfo.cs b/Sockets/Sockets.Plugin.Android/Properties/AssemblyInfo.cs
@@ -26,5 +26,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("1.1.4")]
-[assembly: AssemblyFileVersion("1.1.4")]
+[assembly: AssemblyVersion("1.1.5")]
+[assembly: AssemblyFileVersion("1.1.5")]
diff --git a/Sockets/Sockets.Plugin.WindowsDesktop/Properties/AssemblyInfo.cs b/Sockets/Sockets.Plugin.WindowsDesktop/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("1.1.4")]
-[assembly: AssemblyFileVersion("1.1.4")]
+[assembly: AssemblyVersion("1.1.5")]
+[assembly: AssemblyFileVersion("1.1.5")]
diff --git a/Sockets/Sockets.Plugin.WindowsPhone8/Properties/AssemblyInfo.cs b/Sockets/Sockets.Plugin.WindowsPhone8/Properties/AssemblyInfo.cs
@@ -35,6 +35,6 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("1.1.4")]
-[assembly: AssemblyFileVersion("1.1.4")]
+[assembly: AssemblyVersion("1.1.5")]
+[assembly: AssemblyFileVersion("1.1.5")]
 [assembly: NeutralResourcesLanguage("en-US")]
diff --git a/Sockets/Sockets.Plugin.WindowsPhone81/Properties/AssemblyInfo.cs b/Sockets/Sockets.Plugin.WindowsPhone81/Properties/AssemblyInfo.cs
@@ -25,6 +25,6 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("1.1.4")]
-[assembly: AssemblyFileVersion("1.1.4")]
+[assembly: AssemblyVersion("1.1.5")]
+[assembly: AssemblyFileVersion("1.1.5")]
 [assembly: ComVisible(false)]
diff --git a/Sockets/Sockets.Plugin.WindowsStore/Properties/AssemblyInfo.cs b/Sockets/Sockets.Plugin.WindowsStore/Properties/AssemblyInfo.cs
@@ -25,6 +25,6 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("1.1.4")]
-[assembly: AssemblyFileVersion("1.1.4")]
+[assembly: AssemblyVersion("1.1.5")]
+[assembly: AssemblyFileVersion("1.1.5")]
 [assembly: ComVisible(false)]
diff --git a/Sockets/Sockets.Plugin.iOS/Properties/AssemblyInfo.cs b/Sockets/Sockets.Plugin.iOS/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("1.1.4")]
-[assembly: AssemblyFileVersion("1.1.4")]
+[assembly: AssemblyVersion("1.1.5")]
+[assembly: AssemblyFileVersion("1.1.5")]
diff --git a/Sockets/Sockets.Plugin.iOSUnified/Properties/AssemblyInfo.cs b/Sockets/Sockets.Plugin.iOSUnified/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("1.1.4")]
-[assembly: AssemblyFileVersion("1.1.4")]
+[assembly: AssemblyVersion("1.1.5")]
+[assembly: AssemblyFileVersion("1.1.5")]
diff --git a/Sockets/Sockets.Plugin/Properties/AssemblyInfo.cs b/Sockets/Sockets.Plugin/Properties/AssemblyInfo.cs
@@ -26,5 +26,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("1.1.4")]
-[assembly: AssemblyFileVersion("1.1.4")]
+[assembly: AssemblyVersion("1.1.5")]
+[assembly: AssemblyFileVersion("1.1.5")]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
		<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PCL/@EntryIndexedValue">PCL</s:String></wpf:ResourceDictionary>