diff options
| author | Liong Sauw Ming <ming@teluu.com> | 2013-02-27 11:37:02 +0000 |
|---|---|---|
| committer | Liong Sauw Ming <ming@teluu.com> | 2013-02-27 11:37:02 +0000 |
| commit | 722633a6c5ef5496d48ab9ea7efacdf6acf8c303 (patch) | |
| tree | 1dd2c50efa37c0a9bfcedb5f8298a078b022df07 | |
| parent | 836cece4d96f095cf538ca81aa97305f8ca6d147 (diff) | |
Re #1565: Backported to 1.x
git-svn-id: http://svn.pjsip.org/repos/pjproject/branches/1.x@4390 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjlib-util/src/pjlib-util/resolver.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pjlib-util/src/pjlib-util/resolver.c b/pjlib-util/src/pjlib-util/resolver.c index 81220bc9..b80fd2e5 100644 --- a/pjlib-util/src/pjlib-util/resolver.c +++ b/pjlib-util/src/pjlib-util/resolver.c @@ -1248,6 +1248,9 @@ static void on_timeout( pj_timer_heap_t *timer_heap, pj_hash_set(NULL, resolver->hquerybyid, &q->id, sizeof(q->id), 0, NULL); pj_hash_set(NULL, resolver->hquerybyres, &q->key, sizeof(q->key), 0, NULL); + /* Workaround for deadlock problem in #1565 (similar to #1108) */ + pj_mutex_unlock(resolver->mutex); + /* Call application callback, if any. */ if (q->cb) (*q->cb)(q->user_data, PJ_ETIMEDOUT, NULL); @@ -1260,6 +1263,9 @@ static void on_timeout( pj_timer_heap_t *timer_heap, cq = cq->next; } + /* Workaround for deadlock problem in #1565 (similar to #1108) */ + pj_mutex_lock(resolver->mutex); + /* Clear data */ q->timer_entry.id = 0; q->user_data = NULL; |