Issue grpc#35989 Potential Crash in GRPC code

ActianCorp · Sep 24, 2024 · 303a457 · 303a457
1 parent 97f22ce
commit 303a457
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/core/lib/promise/activity.h b/src/core/lib/promise/activity.h
@@ -668,11 +668,13 @@ ActivityPtr MakeActivity(Factory promise_factory,
 }
 
 inline Pending IntraActivityWaiter::pending() {
-  const auto new_wakeups = GetContext<Activity>()->CurrentParticipant();
-  GRPC_TRACE_LOG(promise_primitives, INFO)
-      << "IntraActivityWaiter::pending: "
-      << GRPC_DUMP_ARGS(this, new_wakeups, wakeups_);
-  wakeups_ |= new_wakeups;
+  if (Activity::current()) {
+      const auto new_wakeups = GetContext<Activity>()->CurrentParticipant();
+      GRPC_TRACE_LOG(promise_primitives, INFO)
+            << "IntraActivityWaiter::pending: "
+            << GRPC_DUMP_ARGS(this, new_wakeups, wakeups_);
+      wakeups_ |= new_wakeups;
+  }
   return Pending();
 }