Merge remote-tracking branch 'upstream/master' into dev/aarch32/dunlop

dyninst · Nov 13, 2017 · 323eb1a · 323eb1a
2 parents fec1e18 + 2e25791
commit 323eb1a
Show file tree

Hide file tree

Showing 5 changed files with 226 additions and 172 deletions.
diff --git a/common/src/addrtranslate-sysv.C b/common/src/addrtranslate-sysv.C
@@ -800,6 +800,7 @@ bool AddressTranslateSysV::refresh()
          continue;
       }
       if (obj_name == "linux-vdso.so.1" ||
+	  obj_name == "linux-vdso64.so.1" ||
           obj_name == "linux-gate.so.1") 
       {
          continue;

diff --git a/dyninstAPI/src/dynProcess.C b/dyninstAPI/src/dynProcess.C
@@ -1057,6 +1057,7 @@ bool PCProcess::detachProcess(bool /*cont*/) {
             if( !stopProcess() ) {
                 proccontrol_printf("%s[%d]: failed to stop process for removing syscalls\n",
                         FILE__, __LINE__);
+		return false;
             }
         }
 

diff --git a/symtabAPI/src/Object-elf.C b/symtabAPI/src/Object-elf.C
@@ -4380,7 +4380,7 @@ void Object::parseLineInfoForCU(Dwarf_Die cuDIE, LineInformation* li_for_module)
         auto tmp = strrchr(filename, '/');
         if(truncateLineFilenames && tmp)
         {
-            strings->push_back(tmp);
+            strings->push_back(++tmp);
         }
         else
         {