From 3444af58b49afff543f972372cf3e4d93c5b41f9 Mon Sep 17 00:00:00 2001
From: Brigitte Duplenne <brigitte.duplenne@actian.com>
Date: Thu, 22 Feb 2024 17:13:55 -0800
Subject: [PATCH] 	OR-6597 	Avoid potential crash by testing NULL
 pointer in IntraActivityWaiter::pending()

---
 src/core/lib/promise/activity.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/core/lib/promise/activity.h b/src/core/lib/promise/activity.h
index 65b644902c729..742b63ccf599c 100644
--- a/src/core/lib/promise/activity.h
+++ b/src/core/lib/promise/activity.h
@@ -638,7 +638,9 @@ ActivityPtr MakeActivity(Factory promise_factory,
 }
 
 inline Pending IntraActivityWaiter::pending() {
-  wakeups_ |= GetContext<Activity>()->CurrentParticipant();
+  if (Activity::current()) {
+    wakeups_ |= GetContext<Activity>()->CurrentParticipant();
+  }
   return Pending();
 }