commit 4052997c65187bd2d04a4e33101f554992c12694
author Brian Sheedy <bsheedy@chromium.org> Mon Feb 10 11:48:51 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Tue Jan 19 06:46:53 2021 -0800
tree 2c2fd0fa3926c06c77eb377cf68706e10259738a
parent f4740fdf7b6a7eb97b43f4035b31a82125e2a69f

Remove failing thread suspend DCHECK

Removes a failing DCHECK in process_reader_win.cc caused by a race
condition with a thread being injected into a process whose existing
threads are already suspended.

Bug: chromium:1007013
Change-Id: I61b6823e6ec0583e591097cd7d7f55eb88369600
Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/2047803
Reviewed-by: Mark Mentovai <mark@chromium.org>
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
GitOrigin-RevId: ff1036aa601703a3c55b8c3fce07295c5acedb9d

snapshot/win/process_reader_win.cc

diff --git a/snapshot/win/process_reader_win.cc b/snapshot/win/process_reader_win.cc
index 16280e9..51940c0 100644
--- a/snapshot/win/process_reader_win.cc
+++ b/snapshot/win/process_reader_win.cc
@@ -151,11 +151,17 @@
       PLOG(ERROR) << "SuspendThread";
       return false;
     }
-    DCHECK(previous_suspend_count > 0 ||
-           suspension_state == ProcessSuspensionState::kRunning);
-    thread->suspend_count =
-        previous_suspend_count -
-        (suspension_state == ProcessSuspensionState::kSuspended ? 1 : 0);
+    if (previous_suspend_count <= 0 &&
+        suspension_state == ProcessSuspensionState::kSuspended) {
+      LOG(WARNING) << "Thread " << thread->id
+                   << " should be suspended, but previous_suspend_count is "
+                   << previous_suspend_count;
+      thread->suspend_count = 0;
+    } else {
+      thread->suspend_count =
+          previous_suspend_count -
+          (suspension_state == ProcessSuspensionState::kSuspended ? 1 : 0);
+    }
 
     memset(&thread->context, 0, sizeof(thread->context));
 #if defined(ARCH_CPU_32_BITS)