From 4f01bb5e502a4e65a16e4f2ea9995e2351d7ba9c Mon Sep 17 00:00:00 2001 From: Alexandr Anikin Date: Mon, 3 Oct 2011 19:16:19 +0000 Subject: Merged revisions 339089 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/10 ................ r339089 | may | 2011-10-03 22:52:55 +0400 (Mon, 03 Oct 2011) | 10 lines Merged revisions 339087 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r339087 | may | 2011-10-03 22:42:49 +0400 (Mon, 03 Oct 2011) | 4 lines destroy memheap mutex properly before memheap deleted (fix memory leak occured after r304950 changes with DEBUG_THREAD compile option) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339091 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- addons/ooh323c/src/memheap.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'addons/ooh323c/src') diff --git a/addons/ooh323c/src/memheap.c b/addons/ooh323c/src/memheap.c index 99ed06ba7..0515ff9ac 100644 --- a/addons/ooh323c/src/memheap.c +++ b/addons/ooh323c/src/memheap.c @@ -1078,9 +1078,10 @@ void memHeapRelease (void** ppvMemHeap) free (pMemLink2); } - if ((*ppMemHeap)->flags & RT_MH_FREEHEAPDESC) + if ((*ppMemHeap)->flags & RT_MH_FREEHEAPDESC) { + ast_mutex_destroy(&pMemHeap->pLock); free (*ppMemHeap); - + } *ppMemHeap = 0; } } -- cgit v1.2.3