diff options
author | Liong Sauw Ming <ming@teluu.com> | 2015-03-03 02:41:27 +0000 |
---|---|---|
committer | Liong Sauw Ming <ming@teluu.com> | 2015-03-03 02:41:27 +0000 |
commit | aa1b2aeb3da5323717ae13c281f214bca8a511ce (patch) | |
tree | cf0185cd8a4fa74541605e14b5ad67856440b98c /pjmedia/src/pjmedia-codec/passthrough.c | |
parent | 29f035e34a157bbc553f236430586ea0eca64766 (diff) |
Fixed #1818: Fixed destruction of locked mutex (thanks to Denis Poltorak for the Helgrind report)
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4987 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/src/pjmedia-codec/passthrough.c')
-rw-r--r-- | pjmedia/src/pjmedia-codec/passthrough.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pjmedia/src/pjmedia-codec/passthrough.c b/pjmedia/src/pjmedia-codec/passthrough.c index 60b44ea1..551a8483 100644 --- a/pjmedia/src/pjmedia-codec/passthrough.c +++ b/pjmedia/src/pjmedia-codec/passthrough.c @@ -447,6 +447,7 @@ PJ_DEF(pj_status_t) pjmedia_codec_passthrough_deinit(void) if (!codec_mgr) { pj_pool_release(codec_factory.pool); codec_factory.pool = NULL; + pj_mutex_unlock(codec_factory.mutex); return PJ_EINVALIDOP; } @@ -455,7 +456,9 @@ PJ_DEF(pj_status_t) pjmedia_codec_passthrough_deinit(void) &codec_factory.base); /* Destroy mutex. */ + pj_mutex_unlock(codec_factory.mutex); pj_mutex_destroy(codec_factory.mutex); + codec_factory.mutex = NULL; /* Destroy pool. */ pj_pool_release(codec_factory.pool); |