Fix lookup assembly (#2495)

***NO_CI***

Author: josesimoes

src/CLR/Core/CLR_RT_SystemAssembliesTable.cpp

@@ -4,42 +4,34 @@
 // See LICENSE file in the project root for full license information.
 //
 #include <nanoCLR_Runtime.h>
-//#include <corlib_native.h>
-//#include <SPOT_native.h>
-//#include "nanoCLR_Interop.h"
 
-static const CLR_RT_NativeAssemblyData *LookUpAssemblyNativeDataByName
-(
+static const CLR_RT_NativeAssemblyData *LookUpAssemblyNativeDataByName(
     const CLR_RT_NativeAssemblyData **pAssembliesNativeData,
-    const char *lpszAssemblyName
-)
+    const char *lpszAssemblyName)
 {
     // Just sanity check to avoid crash in strcmp if name is NULL.
-    if ( lpszAssemblyName == NULL )
+    if (lpszAssemblyName == NULL)
     {
         return NULL;
     }
 
     // Loops in all entries and looks for the CLR_RT_NativeAssemblyData with name same as lpszAssemblyName
-    for ( int i = 0; pAssembliesNativeData[ i ]; i++ )
+    for (int i = 0; pAssembliesNativeData[i]; i++)
     {
-        if ( pAssembliesNativeData[ i ] != NULL  &&  0 == strcmp( lpszAssemblyName, pAssembliesNativeData[ i ]->m_szAssemblyName ) )
+        if (i < g_CLR_InteropAssembliesCount && pAssembliesNativeData[i] != NULL &&
+            0 == strcmp(lpszAssemblyName, pAssembliesNativeData[i]->m_szAssemblyName))
         {
-            return pAssembliesNativeData[ i ];
+            return pAssembliesNativeData[i];
         }
     }
+
     return NULL;
 }
 
-
-const CLR_RT_NativeAssemblyData *GetAssemblyNativeData( const char *lpszAssemblyName )
+const CLR_RT_NativeAssemblyData *GetAssemblyNativeData(const char *lpszAssemblyName)
 {
     extern const CLR_RT_NativeAssemblyData *g_CLR_InteropAssembliesNativeData[];
 
     // This will return NULL if there is no registered interop assembly of that name
-    return LookUpAssemblyNativeDataByName(
-            g_CLR_InteropAssembliesNativeData,
-            lpszAssemblyName
-            );
+    return LookUpAssemblyNativeDataByName(g_CLR_InteropAssembliesNativeData, lpszAssemblyName);
 }
-