kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Bill Hoffman 2004-02-17 08:35:23 -05:00
parent 5a391f8aa7
commit 8f565bdc74
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/cmDynamicLoader.cxx
View File

@ -162,12 +162,19 @@ cmLibHandle cmDynamicLoader::OpenLibrary(const char* libname )
} }
NSObjectFileImageReturnCode rc; NSObjectFileImageReturnCode rc;
NSObjectFileImage image; NSObjectFileImage image = 0;
rc = NSCreateObjectFileImageFromFile(libname, &image); rc = NSCreateObjectFileImageFromFile(libname, &image);
if(!image)
{
return 0;
}
lh = NSLinkModule(image, libname, TRUE); lh = NSLinkModule(image, libname, TRUE);
cmDynamicLoaderCache::GetInstance()->CacheFile(libname, lh); if(lh)
return lh; {
cmDynamicLoaderCache::GetInstance()->CacheFile(libname, lh);
}
return lh;
} }
int cmDynamicLoader::CloseLibrary(cmLibHandle lib) int cmDynamicLoader::CloseLibrary(cmLibHandle lib)
@ -334,6 +341,6 @@ const char* cmDynamicLoader::LibPrefix()
const char* cmDynamicLoader::LibExtension() const char* cmDynamicLoader::LibExtension()
{ {
return CMAKE_SHARED_LIBRARY_SUFFIX; return CMAKE_SHARED_MODULE_SUFFIX;
} }