diff options
| author | Benny Prijono <bennylp@teluu.com> | 2011-06-16 03:49:51 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2011-06-16 03:49:51 +0000 |
| commit | 6e5dd25621edefef5a17a000bd75b0d825d6c32f (patch) | |
| tree | ccd82a4130c8f8e00c7911af0f0ab81941a59500 /pjsip | |
| parent | 342d09b4fa048aad05c04e2706164dc6e8bc3596 (diff) | |
Fixed #1305: Bug in pjsua_call_hangup_all() may cause deadlock (thanks Kees van der Bent for the report)
git-svn-id: http://svn.pjsip.org/repos/pjproject/branches/1.x@3584 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip')
| -rw-r--r-- | pjsip/src/pjsua-lib/pjsua_call.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pjsip/src/pjsua-lib/pjsua_call.c b/pjsip/src/pjsua-lib/pjsua_call.c index e3302746..bbbd7860 100644 --- a/pjsip/src/pjsua-lib/pjsua_call.c +++ b/pjsip/src/pjsua-lib/pjsua_call.c @@ -2181,14 +2181,15 @@ PJ_DEF(void) pjsua_call_hangup_all(void) { unsigned i; - PJSUA_LOCK(); + // This may deadlock, see https://trac.pjsip.org/repos/ticket/1305 + //PJSUA_LOCK(); for (i=0; i<pjsua_var.ua_cfg.max_calls; ++i) { if (pjsua_var.calls[i].inv) pjsua_call_hangup(i, 0, NULL, NULL); } - PJSUA_UNLOCK(); + //PJSUA_UNLOCK(); } |