Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2010-01-22 13:56:50 +0300
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2010-01-22 13:56:50 +0300
commit0c2d03e69f427a3b2285c5b26267004befbcc2a9 (patch)
treebc62f5b892a60e3b9f88001645c2615f0f2220d3
parent70d52156028bdfe042e0aea598830c505b593a9c (diff)
Fix MEM_testN not unlocking mutex correctly, unlikely to lead to
problems in practice but might as well fix.
-rw-r--r--intern/guardedalloc/intern/mallocn.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c
index 15236a2bee4..342852c4f76 100644
--- a/intern/guardedalloc/intern/mallocn.c
+++ b/intern/guardedalloc/intern/mallocn.c
@@ -539,8 +539,10 @@ short MEM_testN(void *vmemh) {
if (membl) membl = MEMNEXT(membl);
while(membl) {
- if (vmemh == membl+1)
+ if (vmemh == membl+1) {
+ mem_unlock_thread();
return 1;
+ }
if(membl->next)
membl= MEMNEXT(membl->next);