Don't create empty blocks for unconditional jumps out of the text segment

[frida/frida.git] / src / disassembler / llvm / LLVMDisassembler.cxx

diff --git a/src/disassembler/llvm/LLVMDisassembler.cxx b/src/disassembler/llvm/LLVMDisassembler.cxx
index 049f1fc90477b82d1a30427bbd7352a9d7a98cf3..5dc7f3a0489d265dc70383c35255ac3dde2eae6b 100644 (file)
--- a/src/disassembler/llvm/LLVMDisassembler.cxx
+++ b/src/disassembler/llvm/LLVMDisassembler.cxx
@@ -322,6 +322,15 @@ void LLVMDisassembler<ELFT>::disassembleFunction(Function* function) {
                                                        if (NULL == manager->getFunction(jmptarget))
                                                                called_functions.push_back(jmptarget);
                                                } else {
+                                                       if(jmptarget < base_address || jmptarget > base_address + size) {
+                                                               if (MIA->isConditionalBranch(inst)) {
+                                                                       LOG4CXX_WARN(logger, "Conditional jump out of the text segment. This should never happen!");
+                                                               } else {
+                                                                       LOG4CXX_INFO(logger, "Unconditional jump to PLT. Assuming Tail-Call to some library");
+                                                                       current_address += inst_size;
+                                                                       continue;
+                                                               }
+                                                       }
                                                        current_block->setNextBlock(0, jmptarget);
                                                        if (new_blocks.find(jmptarget) == new_blocks.end()) {
                                                                BasicBlock * block = manager->newBasicBlock(jmptarget);