diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2015-01-15 17:35:05 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2015-01-15 17:35:05 +0000 |
| commit | fa80d9658df8aff71a8975ab7d1fe477ea3f99b9 (patch) | |
| tree | c2ab69796f62770313970a8acb902021ef27f8e5 /res/res_fax_spandsp.c | |
| parent | 6c426e86bd470c3a2f3b73b3a070583c92c19af4 (diff) | |
res_fax.c, res_fax_spandsp.c: Remove redundant locking.
When FAX was developed, apparently the faxregistry.container used to be a
linked list that was converted to an ao2 container. Some of the
replacement ao2 container operations still had explicit lock/unlocks
around them.
Three off nominal code paths in res_fax.c and res_fax_spandsp.c unlock the
channel even though the routine did not lock the channel and other code
paths in the routine do not unlock the channel.
Review: https://reviewboard.asterisk.org/r/4340/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@430687 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_fax_spandsp.c')
| -rw-r--r-- | res/res_fax_spandsp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/res/res_fax_spandsp.c b/res/res_fax_spandsp.c index 1df2d8160..914b732a6 100644 --- a/res/res_fax_spandsp.c +++ b/res/res_fax_spandsp.c @@ -836,8 +836,8 @@ static int spandsp_fax_gateway_start(struct ast_fax_session *s) p->ist38 = 1; p->ast_t38_state = ast_channel_get_t38_state(s->chan); - if (!(peer = ast_channel_bridge_peer(s->chan))) { - ast_channel_unlock(s->chan); + peer = ast_channel_bridge_peer(s->chan); + if (!peer) { return -1; } |