Loading...
--- dyld/dyld-360.18/src/dyldNew.cpp
+++ dyld/dyld-239.4/src/dyldNew.cpp
@@ -41,7 +41,7 @@
#if __LP64__
// room for about ~1000 initial dylibs
- #define DYLD_POOL_CHUNK_SIZE 200*1024
+ #define DYLD_POOL_CHUNK_SIZE 224*1024
#else
// room for about ~900 initial dylibs
#define DYLD_POOL_CHUNK_SIZE 150*1024
@@ -68,10 +68,6 @@
return p;
}
else {
- if ( size > DYLD_POOL_CHUNK_SIZE ) {
- dyld::log("dyld malloc overflow: size=%zu\n", size);
- exit(1);
- }
size = (size+sizeof(void*)-1) & (-sizeof(void*)); // pointer align
uint8_t* result = currentPool->current;
currentPool->current += size;
@@ -106,8 +102,8 @@
// ignore any pointer within dyld (i.e. stuff from pool or static strings)
if ( (dyld::gLibSystemHelpers != NULL) && ((ptr < &__dso_handle) || (ptr >= &initialPoolContent[DYLD_POOL_CHUNK_SIZE])) ) {
// ignore stuff in any dynamically alloated dyld pools
- for (dyld_static_pool* p = currentPool; p != NULL; p = p->previousPool) {
- if ( (p->pool <= ptr) && (ptr < p->end) ) {
+ for (dyld_static_pool* p = initialPool.previousPool; p != NULL; p = p->previousPool) {
+ if ( (p->pool < ptr) && (ptr < p->end) ) {
// do nothing, pool entries can't be reclaimed
//dyld::log("free(%p) from dynamic pool\n", ptr);
return;
@@ -132,13 +128,7 @@
return result;
}
else {
- // Check for overflow of integer multiplication
- size_t total = count * size;
- if ( total/count != size ) {
- dyld::log("dyld calloc overflow: count=%zu, size=%zu\n", count, size);
- exit(1);
- }
- return malloc(total);
+ return malloc(count*size);
}
}