summaryrefslogtreecommitdiff
path: root/pjmedia
diff options
context:
space:
mode:
authorBenny Prijono <bennylp@teluu.com>2013-10-08 11:15:22 +0000
committerBenny Prijono <bennylp@teluu.com>2013-10-08 11:15:22 +0000
commit813db6d4094126dadf3c53ea346b08f04d223528 (patch)
tree1173c4e89ed35a925701c77475222253e5185835 /pjmedia
parentb346c11e228f60113fb60eac1d3f9e39d089ff24 (diff)
Re #1703 General bug fixes: fixed mutex not released on some error condition
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4616 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
-rw-r--r--pjmedia/src/pjmedia/codec.c4
-rw-r--r--pjmedia/src/pjmedia/vid_codec.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/pjmedia/src/pjmedia/codec.c b/pjmedia/src/pjmedia/codec.c
index 3c647670..a79421e5 100644
--- a/pjmedia/src/pjmedia/codec.c
+++ b/pjmedia/src/pjmedia/codec.c
@@ -636,8 +636,10 @@ PJ_DEF(pj_status_t) pjmedia_codec_mgr_set_default_param(
/* Update codec param */
p->param = pjmedia_codec_param_clone(pool, param);
- if (!p->param)
+ if (!p->param) {
+ pj_mutex_unlock(mgr->mutex);
return PJ_EINVAL;
+ }
pj_mutex_unlock(mgr->mutex);
diff --git a/pjmedia/src/pjmedia/vid_codec.c b/pjmedia/src/pjmedia/vid_codec.c
index 93690a29..208c8579 100644
--- a/pjmedia/src/pjmedia/vid_codec.c
+++ b/pjmedia/src/pjmedia/vid_codec.c
@@ -722,8 +722,10 @@ PJ_DEF(pj_status_t) pjmedia_vid_codec_mgr_set_default_param(
/* Update codec default param */
p->param = pjmedia_vid_codec_param_clone(pool, param);
- if (!p->param)
+ if (!p->param) {
+ pj_mutex_unlock(mgr->mutex);
return PJ_EINVAL;
+ }
codec_desc->def_param = p;