summaryrefslogtreecommitdiff
path: root/pjmedia
diff options
context:
space:
mode:
authorNanang Izzuddin <nanang@teluu.com>2009-01-20 10:35:01 +0000
committerNanang Izzuddin <nanang@teluu.com>2009-01-20 10:35:01 +0000
commit944fc88681c9641bd7e502257ae1d1ea9023951f (patch)
tree21c418731d35aff617cb072c760e8e43ccb8abb7 /pjmedia
parent5de89b15dbdb3c97d97e3ebe2ccfcd880d2f077a (diff)
Ticket #698: Fixed the silly bug of possible NULL opt access.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2424 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
-rw-r--r--pjmedia/src/pjmedia/transport_srtp.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/pjmedia/src/pjmedia/transport_srtp.c b/pjmedia/src/pjmedia/transport_srtp.c
index ded78b91..d46d4fc0 100644
--- a/pjmedia/src/pjmedia/transport_srtp.c
+++ b/pjmedia/src/pjmedia/transport_srtp.c
@@ -384,7 +384,6 @@ PJ_DEF(pj_status_t) pjmedia_transport_srtp_create(
srtp->session_inited = PJ_FALSE;
srtp->bypass_srtp = PJ_FALSE;
srtp->probation_cnt = PROBATION_CNT_INIT;
- srtp->peer_use = opt->use;
if (opt) {
srtp->setting = *opt;
@@ -423,6 +422,9 @@ PJ_DEF(pj_status_t) pjmedia_transport_srtp_create(
/* Set underlying transport */
srtp->member_tp = tp;
+ /* Initialize peer's SRTP usage mode. */
+ srtp->peer_use = srtp->setting.use;
+
/* Done */
*p_tp = &srtp->base;