[asterisk-commits] may: trunk r339091 - in /trunk: ./ addons/ooh323c/src/memheap.c

[SVN commits to the Asterisk project]

Author: may
Date: Mon Oct  3 14:16:19 2011
New Revision: 339091

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

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

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

Modified: trunk/addons/ooh323c/src/memheap.c
URL: http://svnview.digium.com/svn/asterisk/trunk/addons/ooh323c/src/memheap.c?view=diff&rev=339091&r1=339090&r2=339091
==============================================================================
--- trunk/addons/ooh323c/src/memheap.c (original)
+++ trunk/addons/ooh323c/src/memheap.c Mon Oct  3 14:16:19 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;
    }
 }