Add doc repo as submodule

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

diff --git a/src/disassembler/llvm/LLVMDisassembler.cxx b/src/disassembler/llvm/LLVMDisassembler.cxx
index 049f1fc90477b82d1a30427bbd7352a9d7a98cf3..017ef95c5968df6e4419bb5a55972342dc0cd5dd 100644 (file)
--- a/src/disassembler/llvm/LLVMDisassembler.cxx
+++ b/src/disassembler/llvm/LLVMDisassembler.cxx
@@ -217,7 +217,8 @@ template <typename ELFT>
 LLVMDisassembler<ELFT>::~LLVMDisassembler() {}
 
 template <typename ELFT>
-Function* LLVMDisassembler<ELFT>::disassembleFunctionAt(uint64_t address, const std::string& name) {
+Function* LLVMDisassembler<ELFT>::disassembleFunctionAt(uint64_t address,
+                                                        const std::string& name) {
        Function * function;
        SectionRef text_section = getTextSection();
        uint64_t base_address, size;
@@ -322,6 +323,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);
@@ -381,10 +391,10 @@ void LLVMDisassembler<ELFT>::disassemble() {
        // Assume all function symbols actually start a real function
        for (auto x = symbols.begin(); x != symbols.end(); ++x) {
                uint64_t result;
-               bool contains;
                SymbolRef::Type symbol_type;
 
 #if defined(LLVM_35)
+               bool contains;
                if (text_section.containsSymbol(x->second, contains) || !contains)
 #elif defined(LLVM_36)
                if (!text_section.containsSymbol(x->second))
@@ -556,7 +566,7 @@ void LLVMDisassembler<ELFT>::readDynamicSymbols() {
             it != end;
             ++it) {
                if (it->getType() == 2) { // Function
-                       bool is_default;
+                       bool is_default(false);
                        // TODO: Error handling
                        std::string symbolname = *(elffile->getSymbolName(it));
                        std::string symbolversion = *(elffile->getSymbolVersion(nullptr, &*it, is_default));