Make sure thread_identifier_info_t is valid before dereferencing.

kstenerud · Apr 3, 2017 · e8977a4 · e8977a4 · leeeGreat · Dec 30, 2018
1 parent 30b5f48
commit e8977a4
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/Source/KSCrash/Recording/Tools/KSThread.c b/Source/KSCrash/Recording/Tools/KSThread.c
@@ -71,6 +71,11 @@ bool ksthread_getQueueName(const KSThread thread, char* const buffer, int bufLen
     }
 
     thread_identifier_info_t idInfo = (thread_identifier_info_t)info;
+    if(ksmem_isMemoryReadable(idInfo, sizeof(*idInfo)))
+    {
+        KSLOG_DEBUG("Thread %p has an invalid thread identifier info %p", thread, idInfo);
+        return false;
+    }
     dispatch_queue_t* dispatch_queue_ptr = (dispatch_queue_t*)idInfo->dispatch_qaddr;
     if(!ksmem_isMemoryReadable(dispatch_queue_ptr, sizeof(*dispatch_queue_ptr)))
     {