Fix missing null checks in package manager

RedpointArchive · Mar 19, 2016 · 13cf409 · 13cf409
1 parent ee83e58
commit 13cf409
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/Protobuild.FunctionalTests/QueryFeaturesTest.cs b/Protobuild.FunctionalTests/QueryFeaturesTest.cs
@@ -27,7 +27,7 @@ public void GenerationIsCorrect()
                 "no-host-generate",
                 "propagate-features",
                 "task-parallelisation",
-        };
+            };
 
             _assert.Equal(expectedFeatureList, featureList);
         }

diff --git a/Protobuild.Internal/Packages/PackageManager.cs b/Protobuild.Internal/Packages/PackageManager.cs
@@ -102,8 +102,15 @@ public void ResolveAll(ModuleInfo module, string platform, bool? enableParalleli
                         else
                         {
                             var metadata = Lookup(module, submodule1, platform, null, null, forceUpgrade);
-                            resultList.Add(new Tuple<string, Action>(submodule1.Uri,
-                                () => { this.Resolve(metadata, submodule1, null, null, forceUpgrade); }));;
+                            if (metadata == null)
+                            {
+                                resultList.Add(new Tuple<string, Action>(submodule1.Uri, () => { }));
+                            }
+                            else
+                            {
+                                resultList.Add(new Tuple<string, Action>(submodule1.Uri,
+                                    () => { this.Resolve(metadata, submodule1, null, null, forceUpgrade); }));
+                            }
                         }
                     }
                     else
@@ -173,6 +180,10 @@ public void Resolve(ModuleInfo module, PackageRef reference, string platform, st
             bool forceUpgrade = false)
         {
             var metadata = Lookup(module, reference, platform, templateName, source, forceUpgrade);
+            if (metadata == null)
+            {
+                return;
+            }
             Resolve(metadata, reference, templateName, source, forceUpgrade);
         }
 

diff --git a/Protobuild.exe b/Protobuild.exe
diff --git a/Protobuild/Protobuild.Internal.dll.lzma b/Protobuild/Protobuild.Internal.dll.lzma