diff options
| -rw-r--r-- | main/rtp_engine.c | 2 | ||||
| -rw-r--r-- | res/res_rtp_asterisk.c | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/main/rtp_engine.c b/main/rtp_engine.c index 34e6a9439..9c9ad4e7b 100644 --- a/main/rtp_engine.c +++ b/main/rtp_engine.c @@ -1659,6 +1659,8 @@ int ast_rtp_dtls_cfg_parse(struct ast_rtp_dtls_cfg *dtls_cfg, const char *name, void ast_rtp_dtls_cfg_copy(const struct ast_rtp_dtls_cfg *src_cfg, struct ast_rtp_dtls_cfg *dst_cfg) { + ast_rtp_dtls_cfg_free(dst_cfg); /* Prevent a double-call leaking memory via ast_strdup */ + dst_cfg->enabled = src_cfg->enabled; dst_cfg->verify = src_cfg->verify; dst_cfg->rekey = src_cfg->rekey; diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c index 0513c1127..62601dcad 100644 --- a/res/res_rtp_asterisk.c +++ b/res/res_rtp_asterisk.c @@ -1869,6 +1869,7 @@ static int dtls_srtp_setup(struct ast_rtp *rtp, struct ast_srtp *srtp, struct as unsigned char *local_key, *local_salt, *remote_key, *remote_salt; struct ast_srtp_policy *local_policy, *remote_policy = NULL; struct ast_rtp_instance_stats stats = { 0, }; + int res = -1; /* If a fingerprint is present in the SDP make sure that the peer certificate matches it */ if (rtp->dtls_verify & AST_RTP_DTLS_VERIFY_FINGERPRINT) { @@ -1983,16 +1984,17 @@ static int dtls_srtp_setup(struct ast_rtp *rtp, struct ast_srtp *srtp, struct as } } - return 0; + res = 0; error: + /* policy->destroy() called even on success to release local reference to these resources */ res_srtp_policy->destroy(local_policy); if (remote_policy) { res_srtp_policy->destroy(remote_policy); } - return -1; + return res; } #endif |