Merge pull request #5243 from TannerRogalsky/fix_main_thread_locking

Fix crash when calling pthread_mutex_lock on the main thread

Author: juj

src/library_pthread.js

@@ -25,6 +25,10 @@ var LibraryPThread = {
       // structure is 'alive'.
       {{{ makeSetValue('PThread.mainThreadBlock', C_STRUCTS.pthread.self, 'PThread.mainThreadBlock', 'i32') }}};
 
+      // pthread struct robust_list head should point to itself.
+      var headPtr = PThread.mainThreadBlock + {{{ C_STRUCTS.pthread.robust_list }}};
+      {{{ makeSetValue('headPtr', 0, 'headPtr', 'i32') }}};
+
       // Allocate memory for thread-local storage.
       var tlsMemory = allocate({{{ cDefine('PTHREAD_KEYS_MAX') }}} * 4, "i32*", ALLOC_STATIC);
       for (var i = 0; i < {{{ cDefine('PTHREAD_KEYS_MAX') }}}; ++i) HEAPU32[tlsMemory/4+i] = 0;

tests/pthread/test_pthread_mutex.cpp

@@ -95,15 +95,16 @@ int main()
 	pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
 	pthread_mutex_init(&lock, &attr);
 
+	pthread_mutex_lock(&lock);
+	pthread_mutex_unlock(&lock);
+
 	if (emscripten_has_threading_support()) {
 		// Create new threads in parallel.
 		for(int i = 0; i < NUM_THREADS; ++i)
 			CreateThread(i, threadNum++);
 
 		emscripten_set_main_loop(WaitToJoin, 0, 0);
 	} else {
-		pthread_mutex_lock(&lock);
-		pthread_mutex_unlock(&lock);
 #ifdef REPORT_RESULT
 		int result = 50;
 		REPORT_RESULT();