From 8108b3dd74816fca996199722efbffcdd4b7c39c Mon Sep 17 00:00:00 2001
From: Sarbojit Sarkar <sarbojit.sarkar@amd.com>
Date: Tue, 15 Mar 2022 11:50:00 +0000
Subject: [PATCH] SWDEV-327455 - Fix for event node crash

Change-Id: I4418800f04450f1bd23cef4e7812631727458a3b


[ROCm/clr commit: 33687d8cab55e11acedd3657e7d4f4bffef15fce]
---
 projects/clr/hipamd/src/hip_event.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/projects/clr/hipamd/src/hip_event.cpp b/projects/clr/hipamd/src/hip_event.cpp
index 3fa8837fee..9a036127e2 100644
--- a/projects/clr/hipamd/src/hip_event.cpp
+++ b/projects/clr/hipamd/src/hip_event.cpp
@@ -131,7 +131,9 @@ int64_t Event::time() const {
 
 hipError_t Event::streamWaitCommand(amd::Command*& command, amd::HostQueue* queue) {
   amd::Command::EventWaitList eventWaitList;
-  eventWaitList.push_back(event_);
+  if (event_ != nullptr) {
+    eventWaitList.push_back(event_);
+  }
   command = new amd::Marker(*queue, kMarkerDisableFlush, eventWaitList);
 
   if (command == NULL) {