Changeset 4987 for pjproject/trunk/pjmedia/src/pjmedia-codec/g7221.c

Timestamp:

Mar 3, 2015 2:41:27 AM (10 years ago)

Author:

ming

Message:

Fixed #1818: Fixed destruction of locked mutex (thanks to Denis Poltorak for the Helgrind report)

File:

• pjproject/trunk/pjmedia/src/pjmedia-codec/g7221.c (modified) (2 diffs)

pjproject/trunk/pjmedia/src/pjmedia-codec/g7221.c

@@ -470 +470 @@
         pj_pool_release(codec_factory.pool);
         codec_factory.pool = NULL;
+        pj_mutex_unlock(codec_factory.mutex);
         return PJ_EINVALIDOP;
     }
@@ -478 +479 @@
     
     /* Destroy mutex. */
+    pj_mutex_unlock(codec_factory.mutex);
     pj_mutex_destroy(codec_factory.mutex);
+    codec_factory.mutex = NULL;
 
     /* Destroy pool. */