Added check for whether thread lock is being removed while thread is using guarded alloc.

--
svn merge -r58788:58789 ^/branches/soc-2013-depsgraph_mt

1 files changed, 6 insertions, 0 deletions

diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c
index 06ae2ee864d..520df788055 100644
--- a/intern/guardedalloc/intern/mallocn.c
+++ b/intern/guardedalloc/intern/mallocn.c
@@ -280,6 +280,12 @@ static void mem_lock_thread(void)
 
 static void mem_unlock_thread(void)
 {
+#ifdef DEBUG_THREADS
+	if (!pthread_equal(pthread_self(), mainid) && thread_lock_callback == NULL) {
+		assert(!"Thread lock was removed while allocation from thread is in progress");
+	}
+#endif
+
 	if (thread_unlock_callback)
 		thread_unlock_callback();
 }