BUG: don't crash when loading a module that does not exist

1 files changed, 11 insertions, 4 deletions

diff --git a/Source/cmDynamicLoader.cxx b/Source/cmDynamicLoader.cxx
index 14568bf1b7..e6c71b25c0 100644
--- a/Source/cmDynamicLoader.cxx
+++ b/Source/cmDynamicLoader.cxx
@@ -162,12 +162,19 @@ cmLibHandle cmDynamicLoader::OpenLibrary(const char* libname )
     }
   
   NSObjectFileImageReturnCode rc;
-  NSObjectFileImage image;
+  NSObjectFileImage image = 0;
 
   rc = NSCreateObjectFileImageFromFile(libname, &image);
+  if(!image)
+    {
+    return 0;
+    }
   lh = NSLinkModule(image, libname, TRUE);
-  cmDynamicLoaderCache::GetInstance()->CacheFile(libname, lh);
-  return lh; 
+  if(lh)
+    {
+    cmDynamicLoaderCache::GetInstance()->CacheFile(libname, lh);
+    }
+  return lh;
 }
 
 int cmDynamicLoader::CloseLibrary(cmLibHandle lib)
@@ -334,6 +341,6 @@ const char* cmDynamicLoader::LibPrefix()
 
 const char* cmDynamicLoader::LibExtension()
 {
-  return CMAKE_SHARED_LIBRARY_SUFFIX;
+  return CMAKE_SHARED_MODULE_SUFFIX;
 }