Loading...
--- dyld/dyld-195.6/src/dyldAPIs.cpp
+++ dyld/dyld-239.3/src/dyldAPIs.cpp
@@ -80,8 +80,7 @@
// In 10.3.x and earlier all the NSObjectFileImage API's were implemeneted in libSystem.dylib
// Beginning in 10.4 the NSObjectFileImage API's are implemented in dyld and libSystem just forwards
// This conditional keeps support for old libSystem's which needed some help implementing the API's
-#define OLD_LIBSYSTEM_SUPPORT (__ppc__ || __i386__)
-
+#define OLD_LIBSYSTEM_SUPPORT (__i386__)
// The following functions have no prototype in any header. They are special cases
// where _dyld_func_lookup() is used directly.
@@ -148,6 +147,7 @@
#if __IPHONE_OS_VERSION_MIN_REQUIRED
{"__dyld_shared_cache_some_image_overridden", (void*)dyld_shared_cache_some_image_overridden },
#endif
+ {"__dyld_process_is_restricted", (void*)dyld::processIsRestricted },
// deprecated
#if DEPRECATED_APIS_SUPPORTED
@@ -240,6 +240,9 @@
const void* imageBaseAddress; // not used with OFI created from files
size_t imageLength; // not used with OFI created from files
};
+
+
+VECTOR_NEVER_DESTRUCTED(NSObjectFileImage);
static std::vector<NSObjectFileImage> sObjectFileImages;
@@ -334,7 +337,7 @@
dyld::log("%s(%u)\n", __func__, image_index);
ImageLoader* image = dyld::getIndexedImage(image_index);
if ( image != NULL )
- return image->getPath();
+ return image->getRealPath();
else
return NULL;
}
@@ -543,7 +546,7 @@
if ( image != NULL ) {
if ( context.matchByInstallName )
image->setMatchInstallPath(true);
- dyld::link(image, false, callersRPaths);
+ dyld::link(image, false, false, callersRPaths);
dyld::runInitializers(image);
// images added with NSAddImage() can never be unloaded
image->setNeverUnload();
@@ -582,7 +585,7 @@
const bool dontLoad = ( (options & NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED) != 0 );
const bool search = ( (options & NSADDIMAGE_OPTION_WITH_SEARCHING) != 0 );
const bool matchInstallName = ( (options & NSADDIMAGE_OPTION_MATCH_FILENAME_BY_INSTALLNAME) != 0 );
- const bool abortOnError = ( (options & NSADDIMAGE_OPTION_RETURN_ON_ERROR|NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED) == 0 );
+ const bool abortOnError = ( (options & (NSADDIMAGE_OPTION_RETURN_ON_ERROR|NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED)) == 0 );
void* callerAddress = __builtin_return_address(1); // note layers: 1: real client, 0: libSystem glue
return addImage(callerAddress, path, search, dontLoad, matchInstallName, abortOnError);
}
@@ -973,6 +976,9 @@
dyld::clearErrorMessage();
try {
+ if ( (options & NSLINKMODULE_OPTION_CAN_UNLOAD) != 0 )
+ objectFileImage->image->setCanUnload();
+
// NSLinkModule allows a bundle to be link multpile times
// each link causes the bundle to be copied to a new address
if ( objectFileImage->image->isLinked() ) {
@@ -999,7 +1005,7 @@
bool forceLazysBound = ( (options & NSLINKMODULE_OPTION_BINDNOW) != 0 );
// load libraries, rebase, bind, to make this image usable
- dyld::link(objectFileImage->image, forceLazysBound, ImageLoader::RPathChain(NULL,NULL));
+ dyld::link(objectFileImage->image, forceLazysBound, false, ImageLoader::RPathChain(NULL,NULL));
// bump reference count to keep this bundle from being garbage collected
objectFileImage->image->incrementDlopenReferenceCount();
@@ -1045,7 +1051,7 @@
bool forceLazysBound = ( (options & NSLINKMODULE_OPTION_BINDNOW) != 0 );
// load libraries, rebase, bind, to make this image usable
- dyld::link(image, forceLazysBound, ImageLoader::RPathChain(NULL,NULL));
+ dyld::link(image, forceLazysBound, false, ImageLoader::RPathChain(NULL,NULL));
// run initializers unless magic flag says not to
if ( (options & NSLINKMODULE_OPTION_DONT_CALL_MOD_INIT_ROUTINES) == 0 )
@@ -1108,6 +1114,7 @@
ImageLoader* image = NSModuleToImageLoader(module);
if ( image == NULL )
return false;
+ dyld::runImageTerminators(image);
dyld::removeImage(image);
if ( (options & NSUNLINKMODULE_OPTION_KEEP_MEMORY_MAPPED) != 0 )
@@ -1183,12 +1190,10 @@
// If dyld is sending load/unload notices to CoreSymbolication, the shared memory
// page is not copied on fork. <rdar://problem/6797342>
// NULL the CoreSymbolication shared memory pointer to prevent a crash.
- dyld_all_image_infos.coreSymbolicationShmPage = NULL;
+ dyld::gProcessInfo->coreSymbolicationShmPage = NULL;
// for safety, make sure child starts with clean systemOrderFlag
- dyld_all_image_infos.systemOrderFlag = 0;
-}
-
-
+ dyld::gProcessInfo->systemOrderFlag = 0;
+}
typedef void (*MonitorProc)(char *lowpc, char *highpc);
@@ -1265,7 +1270,7 @@
dyld::gLibSystemHelpers = helpers;
// let gdb know it is safe to run code in inferior that might call malloc()
- dyld_all_image_infos.libSystemInitialized = true;
+ dyld::gProcessInfo->libSystemInitialized = true;
#if __arm__
if ( helpers->version >= 5 ) {
@@ -1282,6 +1287,13 @@
static void dlerrorClear()
{
if ( dyld::gLibSystemHelpers != NULL ) {
+ // <rdar://problem/10595338> dlerror buffer leak
+ // dlerrorClear() should not force allocation, but zero it if already allocated
+ if ( dyld::gLibSystemHelpers->version >= 10 ) {
+ if ( ! (*dyld::gLibSystemHelpers->hasPerThreadBufferFor_dlerror)() )
+ return;
+ }
+
// first char of buffer is flag whether string (starting at second char) is valid
char* buffer = (*dyld::gLibSystemHelpers->getThreadBufferFor_dlerror)(2);
buffer[0] = '\0';
@@ -1471,7 +1483,7 @@
if ( (mode & RTLD_NOLOAD) == 0 ) {
bool alreadyLinked = image->isLinked();
bool forceLazysBound = ( (mode & RTLD_NOW) != 0 );
- dyld::link(image, forceLazysBound, callersRPaths);
+ dyld::link(image, forceLazysBound, false, callersRPaths);
if ( ! alreadyLinked ) {
// only hide exports if image is not already in use
if ( (mode & RTLD_LOCAL) != 0 )
@@ -1517,9 +1529,12 @@
// load() succeeded but, link() failed
// back down reference count and do GC
image->decrementDlopenReferenceCount();
- dyld::garbageCollectImages();
+ if ( image->dlopenCount() == 0 )
+ dyld::garbageCollectImages();
}
const char* str = dyld::mkstringf("dlopen(%s, %d): %s", path, mode, msg);
+ if ( dyld::gLogAPIs )
+ dyld::log(" %s() failed, error: '%s'\n", __func__, str);
dlerrorSet(str);
free((void*)str);
free((void*)msg); // our free() will do nothing if msg is a string literal
@@ -1540,6 +1555,8 @@
CRSetCrashLogMessage(NULL);
dyld::gLibSystemHelpers->releaseGlobalDyldLock();
}
+ if ( dyld::gLogAPIs && (result != NULL) )
+ dyld::log(" %s(%s) ==> %p\n", __func__, path, result);
return result;
}
@@ -1565,7 +1582,8 @@
return -1;
}
// remove image if reference count went to zero
- dyld::garbageCollectImages();
+ if ( image->dlopenCount() == 0 )
+ dyld::garbageCollectImages();
return 0;
}
else {
@@ -1584,7 +1602,7 @@
CRSetCrashLogMessage("dyld: in dladdr()");
ImageLoader* image = dyld::findImageContainingAddress(address);
if ( image != NULL ) {
- info->dli_fname = image->getPath();
+ info->dli_fname = image->getRealPath();
info->dli_fbase = (void*)image->machHeader();
if ( address == info->dli_fbase ) {
// special case lookup of header
@@ -1595,6 +1613,13 @@
}
// find closest symbol in the image
info->dli_sname = image->findClosestSymbol(address, (const void**)&info->dli_saddr);
+ // never return the mach_header symbol
+ if ( info->dli_saddr == info->dli_fbase ) {
+ info->dli_sname = NULL;
+ info->dli_saddr = NULL;
+ CRSetCrashLogMessage(NULL);
+ return 1; // success
+ }
if ( info->dli_sname != NULL ) {
if ( info->dli_sname[0] == '_' )
info->dli_sname = info->dli_sname +1; // strip off leading underscore
@@ -1618,6 +1643,12 @@
dyld::log("%s()\n", __func__);
if ( dyld::gLibSystemHelpers != NULL ) {
+ // if using newer libdyld.dylib and buffer if buffer not yet allocated, return NULL
+ if ( dyld::gLibSystemHelpers->version >= 10 ) {
+ if ( ! (*dyld::gLibSystemHelpers->hasPerThreadBufferFor_dlerror)() )
+ return NULL;
+ }
+
// first char of buffer is flag whether string (starting at second char) is valid
char* buffer = (*dyld::gLibSystemHelpers->getThreadBufferFor_dlerror)(2);
if ( buffer[0] != '\0' ) { // if valid buffer
@@ -1675,15 +1706,7 @@
// magic "search what I would see" handle
if ( handle == RTLD_NEXT ) {
-#if __ppc__
- // <rdar://problem/7628929> work around for llvmgcc bug
- void* fa = __builtin_frame_address(0);
- fa = *(void**)fa;
- fa = *(void**)fa;
- void* callerAddress = *((void**)(((int)fa)+8));
-#else
void* callerAddress = __builtin_return_address(1); // note layers: 1: real client, 0: libSystem glue
-#endif
ImageLoader* callerImage = dyld::findImageContainingAddress(callerAddress);
sym = callerImage->findExportedSymbolInDependentImages(underscoredName, dyld::gLinkContext, &image); // don't search image, but do search what it links against
if ( sym != NULL ) {
@@ -1745,7 +1768,7 @@
const struct dyld_all_image_infos* _dyld_get_all_image_infos()
{
- return &dyld_all_image_infos;
+ return dyld::gProcessInfo;
}
#if !__arm__
@@ -1782,7 +1805,7 @@
ImageLoader* image = dyld::findImageContainingAddress(address);
if ( image != NULL )
- return image->getPath();
+ return image->getRealPath();
return NULL;
}
@@ -1791,7 +1814,11 @@
#if __IPHONE_OS_VERSION_MIN_REQUIRED
bool dyld_shared_cache_some_image_overridden()
{
+ #if DYLD_SHARED_CACHE_SUPPORT
return dyld::gSharedCacheOverridden;
+ #else
+ return true;
+ #endif
}
#endif