Fix for D25504 - segfault because of double free()-ing in shutdown code.

Paul Osmialowski pointed out a double free bug in shutdown code.  This patch
Moves the freeing of the implicit task to above the freeing of all fast memory
to prevent the double-free issue.

Differential Revision: https://reviews.llvm.org/D26860

llvm-svn: 287551
This commit is contained in:
Jonathan Peyton 2016-11-21 16:18:57 +00:00
parent 13e45e135f
commit 7ca7ef0478
1 changed files with 2 additions and 1 deletions

View File

@ -5707,6 +5707,8 @@ __kmp_reap_thread(
--__kmp_thread_pool_nth;
}; // if
__kmp_free_implicit_task(thread);
// Free the fast memory for tasking
#if USE_FAST_MEMORY
__kmp_free_fast_memory( thread );
@ -5762,7 +5764,6 @@ __kmp_reap_thread(
}; // if
#endif /* KMP_AFFINITY_SUPPORTED */
__kmp_free_implicit_task(thread);
__kmp_reap_team( thread->th.th_serial_team );
thread->th.th_serial_team = NULL;
__kmp_free( thread );