diff options
Diffstat (limited to 'backends/plugins/elf')
| -rw-r--r-- | backends/plugins/elf/elf-provider.cpp | 16 | ||||
| -rw-r--r-- | backends/plugins/elf/memory-manager.cpp | 6 |
2 files changed, 13 insertions, 9 deletions
diff --git a/backends/plugins/elf/elf-provider.cpp b/backends/plugins/elf/elf-provider.cpp index 6d461c79df..d06c4c1ca1 100644 --- a/backends/plugins/elf/elf-provider.cpp +++ b/backends/plugins/elf/elf-provider.cpp @@ -181,15 +181,15 @@ PluginList ELFPluginProvider::getPlugins() { PluginList pl = FilePluginProvider::getPlugins(); #if defined(UNCACHED_PLUGINS) && !defined(ELF_NO_MEM_MANAGER) - if (!pl.empty()) { - // This static downcast is safe because all of the plugins must - // be ELF plugins - for (PluginList::iterator p = pl.begin(); p != pl.end(); ++p) { - (static_cast<ELFPlugin *>(*p))->trackSize(); - } + // This static downcast is safe because all of the plugins must + // be ELF plugins + for (PluginList::iterator p = pl.begin(); p != pl.end(); ++p) { + (static_cast<ELFPlugin *>(*p))->trackSize(); + } - // The Memory Manager should now allocate space based on the information - // it collected + // The Memory Manager should now allocate space based on the information + // it collected + if (!pl.empty()) { ELFMemMan.allocateHeap(); } #endif diff --git a/backends/plugins/elf/memory-manager.cpp b/backends/plugins/elf/memory-manager.cpp index 5014718ae8..6e54cb8e29 100644 --- a/backends/plugins/elf/memory-manager.cpp +++ b/backends/plugins/elf/memory-manager.cpp @@ -78,9 +78,13 @@ void ELFMemoryManager::trackAlloc(uint32 align, uint32 size) { } void ELFMemoryManager::allocateHeap() { + if (!_heapSize) { + warning("ELFMemoryManager: Unable to allocate the heap as its size could not be determined."); + return; + } + // The memory manager should only allocate once assert (!_heap); - assert (_heapSize); // clear the list _allocList.clear(); |