[asterisk-commits] may: branch 10 r339089 - in /branches/10: ./ addons/ooh323c/src/memheap.c

[SVN commits to the Asterisk project]

Author: may
Date: Mon Oct  3 13:52:55 2011
New Revision: 339089

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=339089
Log:
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)
........

Modified:
    branches/10/   (props changed)
    branches/10/addons/ooh323c/src/memheap.c

Propchange: branches/10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/10/addons/ooh323c/src/memheap.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/addons/ooh323c/src/memheap.c?view=diff&rev=339089&r1=339088&r2=339089
==============================================================================
--- branches/10/addons/ooh323c/src/memheap.c (original)
+++ branches/10/addons/ooh323c/src/memheap.c Mon Oct  3 13:52:55 2011
@@ -1078,9 +1078,10 @@
          free (pMemLink2);
       }
 
-      if ((*ppMemHeap)->flags & RT_MH_FREEHEAPDESC)
+      if ((*ppMemHeap)->flags & RT_MH_FREEHEAPDESC) {
+         ast_mutex_destroy(&pMemHeap->pLock);
          free (*ppMemHeap);
-
+      }
       *ppMemHeap = 0;
    }
 }