summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenny Prijono <bennylp@teluu.com>2009-08-15 09:53:58 +0000
committerBenny Prijono <bennylp@teluu.com>2009-08-15 09:53:58 +0000
commit05b080f7b17a9efbf1bc1a77397865cb97c5db21 (patch)
tree46b107042b80bf53c645d448b5149d3040f72652
parent1f3adc1d518a7904cd53a2df5ec860e59f7936cd (diff)
More ticket #924: removed assertion in detach() since SRTP transport calls this function with NULL argument (in transport_srtp.c:792)
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2881 74dad513-b988-da41-8d7b-12977e46ad98
-rw-r--r--pjmedia/src/pjmedia/transport_loop.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/pjmedia/src/pjmedia/transport_loop.c b/pjmedia/src/pjmedia/transport_loop.c
index 91846db2..dc4008b6 100644
--- a/pjmedia/src/pjmedia/transport_loop.c
+++ b/pjmedia/src/pjmedia/transport_loop.c
@@ -256,12 +256,13 @@ static void transport_detach( pjmedia_transport *tp,
if (loop->users[i].user_data == user_data)
break;
}
- PJ_ASSERT_ON_FAIL(i != loop->user_cnt, return);
/* Remove this user */
- pj_array_erase(loop->users, sizeof(loop->users[0]),
- loop->user_cnt, i);
- --loop->user_cnt;
+ if (i != loop->user_cnt) {
+ pj_array_erase(loop->users, sizeof(loop->users[0]),
+ loop->user_cnt, i);
+ --loop->user_cnt;
+ }
}