CLJCLR-197 - Make sure to catch exceptions thrown by ClrTypeSpec2.Parse.

Author: dmiller

Clojure/Clojure/Lib/ClrTypeSpec2.cs

@@ -540,7 +540,21 @@ void MergeNested(ClrTypeSpec nestedSpec)
 
     #region Parsing
 
-    public static ClrTypeSpec Parse(string typeName)
+    // THis version swallows errors, return null for bad or unknown.
+    public static ClrTypeSpec Parse(string typename)
+    {
+        try
+        {
+            return ParseE(typename);
+
+        }
+        catch
+        {
+            return null;
+        }
+    }
+
+    public static ClrTypeSpec ParseE(string typeName)
     {
         int pos = 0;
         if (typeName is null)

Clojure/Clojure/Lib/RT.cs

@@ -2936,6 +2936,7 @@ internal static Type classForName(string p, Namespace ns, bool canCallClrTypeSpe
 
             var parsedTypename = ClrTypeSpec.Parse(p);
 
+            if (parsedTypename is not null)
             {
                 // Split the type name to identify the namespace and simple name.
                 // If we get something like
@@ -2946,7 +2947,7 @@ internal static Type classForName(string p, Namespace ns, bool canCallClrTypeSpe
 
                 string assemblyNameString = null;
 
-                if (!string.IsNullOrWhiteSpace(parsedTypename.AssemblyName))
+                if (!string.IsNullOrWhiteSpace(parsedTypename?.AssemblyName))
                     assemblyNameString = parsedTypename.AssemblyName;
                 else
                 {
@@ -3049,7 +3050,7 @@ internal static Type classForName(string p, Namespace ns, bool canCallClrTypeSpe
             //return ClrTypeSpec2.GetTypeFromName(p, CurrentNSVar.deref() as Namespace);
             //}
 
-            if (canCallClrTypeSpec)
+            if (canCallClrTypeSpec && parsedTypename is not null)
             {
                 var t1 = ClrTypeSpec.GetTypeFromParsedName(parsedTypename, ns);
                 if (t1 is not null)
@@ -3855,7 +3856,7 @@ static byte[] ReadStreamBytes(Stream stream)
                 var len = stream.Length;
                 var data = new byte[len];
                 int numRead = stream.Read(data, 0, (int)len);
-                if ( numRead < len)
+                if (numRead < len)
                 {
                     throw new EndOfStreamException("Could not read entire stream");
                 }