Merge pull request #1693 from Garciat/fix-assembly-get-satellite
authorMarek Safar <marek.safar@gmail.com>
Wed, 15 Apr 2015 08:50:56 +0000 (10:50 +0200)
committerMarek Safar <marek.safar@gmail.com>
Wed, 15 Apr 2015 08:50:56 +0000 (10:50 +0200)
[corlib] Check for missing/empty Assembly.Location. Fixes #28876

mcs/class/corlib/System.Reflection/Assembly.cs

index ad50e600bbb7a7c4024adb7285023a5bc8ea8444..0bba65f4693a630934df471360618a9d26b4b2f7 100644 (file)
@@ -514,6 +514,9 @@ namespace System.Reflection {
                                // ignore
                        }
 
+                       if (String.IsNullOrEmpty (Location))
+                               return null;
+
                        // Try the assembly directory
                        string location = Path.GetDirectoryName (Location);
                        string fullName = Path.Combine (location, Path.Combine (culture.Name, an.Name + ".dll"));