Fix null reference exception

zeroc-ice · Mar 1, 2016 · ee94988 · ee94988
1 parent fef6bf6
commit ee94988
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 12 deletions.
diff --git a/AddinRemoval/Properties/AssemblyInfo.cs b/AddinRemoval/Properties/AssemblyInfo.cs
@@ -13,5 +13,5 @@
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 [assembly: AssemblyProduct("Ice Visual Studio Extension")]
 [assembly: AssemblyCopyright("Copyright (c) 2009-2016 ZeroC, Inc.")]
-[assembly: AssemblyVersion("4.2.0")]
+[assembly: AssemblyVersion("4.2.1")]
 [assembly: AssemblyDelaySign(false)]
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
+## Changes in Ice Builder for Visual Studio 4.2.1
+
+- Fixed an issue that could cause a null pointer exception when
+  reading the extension settings.
+
 ## Changes in Ice Builder for Visual Studio 4.2.0
 
-- Added support for building the Ice 3.7 source distribution. 
+- Added support for building the Ice 3.7 source distribution.
 
 - Starting with this release, when the Output Directory for a C++ project contains a
   MSBuild property that expands to different values for each configuration, the
@@ -17,7 +22,7 @@
   Automatic Slice file compilation is disabled by default, which speeds up
   the loading of solutions with many projects.
 
-- Visual Studio 2015 is now required to build the Ice Builder, but the resulting 
+- Visual Studio 2015 is now required to build the Ice Builder, but the resulting
   extension remain usable with Visual Studio 2012 and Visual Studio 2013.
 
 ## Changes in Ice Builder for Visual Studio 4.1.2

diff --git a/IceBuilder/Package.cs b/IceBuilder/Package.cs
@@ -174,7 +174,15 @@ public void SetAutoBuilding(bool value)
 
         private bool GetAutoBuilding()
         {
-            return 1 == (int)Microsoft.Win32.Registry.GetValue(IceHomeKey, IceAutoBuilding, 0);
+            try
+            {
+                return 1 == (int)Microsoft.Win32.Registry.GetValue(IceHomeKey, IceAutoBuilding, 0);
+            }
+            catch(System.NullReferenceException)
+            {
+                // Key doesn't exists use the default value
+                return false;
+            }
         }
         public Guid OutputPaneGUID = new Guid("CE9BFDCD-5AFD-4A77-BD40-75E0E1E5162C");
 

diff --git a/IceBuilder/Properties/AssemblyInfo.cs b/IceBuilder/Properties/AssemblyInfo.cs
@@ -15,5 +15,5 @@
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 [assembly: AssemblyProduct("Ice Builder")]
 [assembly: AssemblyCopyright("Copyright (c) 2009-2016 ZeroC, Inc.")]
-[assembly: AssemblyVersion("4.2.0")]
+[assembly: AssemblyVersion("4.2.1")]
 [assembly: ComVisibleAttribute(false)]
diff --git a/IceBuilder/source.extension.vsixmanifest b/IceBuilder/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="ef9502be-dbc2-4568-a846-02b8e42d04c2" Version="4.2.0" Language="en-US" Publisher="ZeroC" />
+    <Identity Id="ef9502be-dbc2-4568-a846-02b8e42d04c2" Version="4.2.1" Language="en-US" Publisher="ZeroC" />
     <DisplayName>Ice Builder</DisplayName>
     <Description xml:space="preserve">Ice Builder manages the compilation of Slice (.ice) files to C++ and C#. It compiles your Slice files with slice2cpp and slice2cs, and allows you to specify the parameters provided to these compilers.</Description>
     <MoreInfo>https://github.com/zeroc-ice/ice-builder-visualstudio</MoreInfo>
@@ -11,7 +11,7 @@
     <Tags>ZeroC, Ice, Slice</Tags>
   </Metadata>
   <Installation>
-    <InstallationTarget Version="[11.0, 14.0]" Id="Microsoft.VisualStudio.Pro" />
+    <InstallationTarget Version="[11.0,]" Id="Microsoft.VisualStudio.Pro" />
   </Installation>
   <Dependencies>
     <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5, 5.0]" />

diff --git a/IceBuilderTasks/Properties/AssemblyInfo.cs b/IceBuilderTasks/Properties/AssemblyInfo.cs
@@ -15,6 +15,6 @@
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 [assembly: AssemblyProduct("Ice Builder")]
 [assembly: AssemblyCopyright("Copyright (c) 2009-2016 ZeroC, Inc.")]
-[assembly: AssemblyVersion("4.2.0")]
+[assembly: AssemblyVersion("4.2.1")]
 [assembly: AssemblyDelaySign(false)]
 [assembly: ComVisibleAttribute(false)]
diff --git a/IceBuilder_Common/Properties/AssemblyInfo.cs b/IceBuilder_Common/Properties/AssemblyInfo.cs
@@ -15,5 +15,5 @@
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 [assembly: AssemblyProduct("Ice Builder")]
 [assembly: AssemblyCopyright("Copyright (c) 2009-2016 ZeroC, Inc.")]
-[assembly: AssemblyVersion("4.2.0")]
+[assembly: AssemblyVersion("4.2.1")]
 [assembly: ComVisibleAttribute(false)]
diff --git a/IceBuilder_VS2012/Properties/AssemblyInfo.cs b/IceBuilder_VS2012/Properties/AssemblyInfo.cs
@@ -15,5 +15,5 @@
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 [assembly: AssemblyProduct("Ice Builder")]
 [assembly: AssemblyCopyright("Copyright (c) 2009-2016 ZeroC, Inc.")]
-[assembly: AssemblyVersion("4.2.0")]
+[assembly: AssemblyVersion("4.2.1")]
 [assembly: ComVisibleAttribute(false)]
diff --git a/IceBuilder_VS2013/Properties/AssemblyInfo.cs b/IceBuilder_VS2013/Properties/AssemblyInfo.cs
@@ -15,5 +15,5 @@
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 [assembly: AssemblyProduct("Ice Builder")]
 [assembly: AssemblyCopyright("Copyright (c) 2009-2016 ZeroC, Inc.")]
-[assembly: AssemblyVersion("4.2.0")]
+[assembly: AssemblyVersion("4.2.1")]
 [assembly: ComVisibleAttribute(false)]
diff --git a/IceBuilder_VS2015/Properties/AssemblyInfo.cs b/IceBuilder_VS2015/Properties/AssemblyInfo.cs
@@ -15,5 +15,5 @@
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 [assembly: AssemblyProduct("Ice Builder")]
 [assembly: AssemblyCopyright("Copyright (c) 2009-2016 ZeroC, Inc.")]
-[assembly: AssemblyVersion("4.2.0")]
+[assembly: AssemblyVersion("4.2.1")]
 [assembly: ComVisibleAttribute(false)]