fix deadlock + crash

x64_dbg_dbg/thread.cpp

@@ -17,11 +17,11 @@ void ThreadCreate(CREATE_THREAD_DEBUG_INFO* CreateThread)
     THREADINFO curInfo;
     memset(&curInfo, 0, sizeof(THREADINFO));
 
-    curInfo.ThreadNumber        = ThreadGetCount();
-    curInfo.Handle              = CreateThread->hThread;
-    curInfo.ThreadId            = ((DEBUG_EVENT*)GetDebugData())->dwThreadId;
-    curInfo.ThreadStartAddress  = (uint)CreateThread->lpStartAddress;
-    curInfo.ThreadLocalBase     = (uint)CreateThread->lpThreadLocalBase;
+    curInfo.ThreadNumber = ThreadGetCount();
+    curInfo.Handle = CreateThread->hThread;
+    curInfo.ThreadId = ((DEBUG_EVENT*)GetDebugData())->dwThreadId;
+    curInfo.ThreadStartAddress = (uint)CreateThread->lpStartAddress;
+    curInfo.ThreadLocalBase = (uint)CreateThread->lpThreadLocalBase;
 
     // The first thread (#0) is always the main program thread
     if(curInfo.ThreadNumber <= 0)
@@ -71,6 +71,14 @@ int ThreadGetCount()
     return (int)threadList.size();
 }
 
+static DWORD getLastErrorFromTeb(ULONG_PTR ThreadLocalBase)
+{
+    TEB teb;
+    if(!ThreadGetTeb(ThreadLocalBase, &teb))
+        return 0;
+    return teb.LastErrorValue;
+}
+
 void ThreadGetList(THREADLIST* List)
 {
     SHARED_ACQUIRE(LockThreads);
@@ -85,7 +93,7 @@ void ThreadGetList(THREADLIST* List)
         return;
 
     List->count = (int)count;
-    List->list  = (THREADALLINFO*)BridgeAlloc(count * sizeof(THREADALLINFO));
+    List->list = (THREADALLINFO*)BridgeAlloc(count * sizeof(THREADALLINFO));
 
     // Fill out the list data
     for(size_t i = 0; i < count; i++)
@@ -98,11 +106,11 @@ void ThreadGetList(THREADLIST* List)
 
         memcpy(&List->list[i].BasicInfo, &threadList[i], sizeof(THREADINFO));
 
-        List->list[i].ThreadCip     = GetContextDataEx(threadHandle, UE_CIP);
-        List->list[i].SuspendCount  = ThreadGetSuspendCount(threadHandle);
-        List->list[i].Priority      = ThreadGetPriority(threadHandle);
-        List->list[i].WaitReason    = ThreadGetWaitReason(threadHandle);
-        List->list[i].LastError     = ThreadGetLastError(List->list[i].BasicInfo.ThreadId);
+        List->list[i].ThreadCip = GetContextDataEx(threadHandle, UE_CIP);
+        List->list[i].SuspendCount = ThreadGetSuspendCount(threadHandle);
+        List->list[i].Priority = ThreadGetPriority(threadHandle);
+        List->list[i].WaitReason = ThreadGetWaitReason(threadHandle);
+        List->list[i].LastError = getLastErrorFromTeb(threadList[i].ThreadLocalBase);
     }
 }
 
@@ -163,21 +171,13 @@ DWORD ThreadGetLastError(DWORD ThreadId)
 {
     SHARED_ACQUIRE(LockThreads);
 
-    TEB teb;
-    memset(&teb, 0, sizeof(TEB));
     for(auto & entry : threadList)
     {
-        if(entry.ThreadId != ThreadId)
-            continue;
-
-        if(!ThreadGetTeb(entry.ThreadLocalBase, &teb))
-        {
-            // TODO: Assert (Why would the TEB fail?)
-            return 0;
-        }
+        if(entry.ThreadId == ThreadId)
+            return getLastErrorFromTeb(entry.ThreadLocalBase);
     }
 
-    return teb.LastErrorValue;
+    return 0;
 }
 
 bool ThreadSetName(DWORD ThreadId, const char* Name)

x64_dbg_gui/Project/Src/Gui/CPUDump.cpp

@@ -8,8 +8,9 @@
 #include "YaraRuleSelectionDialog.h"
 #include "DataCopyDialog.h"
 
-CPUDump::CPUDump(QWidget* parent) : HexDump(parent)
+CPUDump::CPUDump(CPUDisassembly* disas, QWidget* parent) : HexDump(parent)
 {
+    mDisas = disas;
     switch((ViewEnum_t)ConfigUint("HexDump", "DefaultView"))
     {
     case ViewHexAscii:
@@ -1205,11 +1206,9 @@ void CPUDump::hardwareRemoveSlot()
 
 void CPUDump::findReferencesSlot()
 {
-    SELECTIONDATA selection;
-    GuiSelectionGet(GUI_DISASSEMBLY, &selection);
     QString addrStart = QString("%1").arg(rvaToVa(getSelectionStart()), sizeof(int_t) * 2, 16, QChar('0')).toUpper();
     QString addrEnd = QString("%1").arg(rvaToVa(getSelectionEnd()), sizeof(int_t) * 2, 16, QChar('0')).toUpper();
-    QString addrDisasm = QString("%1").arg(selection.start, sizeof(int_t) * 2, 16, QChar('0')).toUpper();
+    QString addrDisasm = QString("%1").arg(mDisas->rvaToVa(mDisas->getSelectionStart()), sizeof(int_t) * 2, 16, QChar('0')).toUpper();
     DbgCmdExec(QString("findrefrange " + addrStart + ", " + addrEnd + ", " + addrDisasm).toUtf8().constData());
     emit displayReferencesWidget();
 }

x64_dbg_gui/Project/Src/Gui/CPUDump.h

@@ -3,12 +3,13 @@
 
 #include "HexDump.h"
 #include "GotoDialog.h"
+#include "CPUDisassembly.h"
 
 class CPUDump : public HexDump
 {
     Q_OBJECT
 public:
-    explicit CPUDump(QWidget* parent = 0);
+    explicit CPUDump(CPUDisassembly* disas, QWidget* parent = 0);
     QString paintContent(QPainter* painter, int_t rowBase, int rowOffset, int col, int x, int y, int w, int h);
     void setupContextMenu();
     void contextMenuEvent(QContextMenuEvent* event);
@@ -169,6 +170,7 @@ private:
     QMenu* mPluginMenu;
 
     GotoDialog* mGoto;
+    CPUDisassembly* mDisas;
 
     enum ViewEnum_t
     {

x64_dbg_gui/Project/Src/Gui/CPUWidget.cpp

@@ -57,7 +57,7 @@ CPUWidget::CPUWidget(QWidget* parent) : QWidget(parent), ui(new Ui::CPUWidget)
 
     ui->mTopRightFrameLayout->addWidget(scrollArea);
 
-    mDump = new CPUDump(0); //dump widget
+    mDump = new CPUDump(mDisas, 0); //dump widget
     ui->mBotLeftFrameLayout->addWidget(mDump);
 
     mStack = new CPUStack(0); //stack widget