From 8cf965f6f1337997922b39c9fddb4f971a8670f1 Mon Sep 17 00:00:00 2001
From: Tobi Ajila <atobia@ca.ibm.com>
Date: Thu, 20 Oct 2022 08:59:17 -0400
Subject: [PATCH] Add missing NULL checks for threadholder in jvmti calls

Signed-off-by: Tobi Ajila <atobia@ca.ibm.com>
---
 runtime/jvmti/jvmtiThread.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/runtime/jvmti/jvmtiThread.c b/runtime/jvmti/jvmtiThread.c
index 0c186b0d64f..bb23e2bcd48 100644
--- a/runtime/jvmti/jvmtiThread.c
+++ b/runtime/jvmti/jvmtiThread.c
@@ -579,7 +579,7 @@ jvmtiGetThreadInfo(jvmtiEnv *env,
 			rv_name = name;
 			{
 #if JAVA_SPEC_VERSION >= 19
-				if (isVirtual) {
+				if (isVirtual || (NULL == threadHolder)) {
 					rv_priority = JVMTI_THREAD_NORM_PRIORITY;
 				} else {
 					rv_priority = J9VMJAVALANGTHREADFIELDHOLDER_PRIORITY(currentThread, threadHolder);
@@ -593,7 +593,11 @@ jvmtiGetThreadInfo(jvmtiEnv *env,
 			if (isVirtual) {
 				rv_is_daemon = JNI_TRUE;
 			} else {
-				rv_is_daemon = J9VMJAVALANGTHREADFIELDHOLDER_DAEMON(currentThread, threadHolder) ? JNI_TRUE : JNI_FALSE;
+				if (NULL == threadHolder) {
+					rv_is_daemon = JNI_FALSE;
+				} else {
+					rv_is_daemon = J9VMJAVALANGTHREADFIELDHOLDER_DAEMON(currentThread, threadHolder) ? JNI_TRUE : JNI_FALSE;
+				}
 			}
 #else /* JAVA_SPEC_VERSION >= 19 */
 			rv_is_daemon = J9VMJAVALANGTHREAD_ISDAEMON(currentThread, threadObject) ? JNI_TRUE : JNI_FALSE;