[runtime] Fix a crash if the thread name is set before the thread is started.

This commit is contained in:
Zoltan Varga committed 2014-04-01 18:32:33 +00:00
1 parent 56cf1b8c2e
commit 695b17f8d5
1 file changed
+7 -2
+7 -2
View File
@@ -669,6 +669,8 @@ static guint32 WINAPI start_wrapper_internal(void *data)
thread_cleanup (internal);
internal->tid = 0;
/* Remove the reference to the thread object in the TLS data,
* so the thread object can be finalized. This won't be
* reached if the thread threw an uncaught exception, so those
@@ -1182,8 +1184,11 @@ mono_thread_set_name_internal (MonoInternalThread *this_obj, MonoString *name, g
if (this_obj->name) {
char *tname = mono_string_to_utf8 (name);
mono_profiler_thread_name (this_obj->tid, tname);
mono_thread_info_set_name (this_obj->tid, tname);
if (this_obj->tid) {
mono_profiler_thread_name (this_obj->tid, tname);
mono_thread_info_set_name (this_obj->tid, tname);
}
mono_free (tname);
}
}