diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2017-12-19 19:20:39 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-12-19 19:20:39 -0600 |
| commit | eda4f59656c448be827cd68d19a87ac197b6d526 (patch) | |
| tree | 7787d232f27f2557b989086e18acaa7de93e3890 | |
| parent | b539ea2a382a13440d2cd6bb7072eb5fe1299299 (diff) | |
| parent | 0e5d8ad09bf8b51d7f5eaed5de308ee05703d87b (diff) | |
Merge "chan_sip: Fix memory leaks." into 13
| -rw-r--r-- | channels/chan_sip.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 522e9d1d6..e6e82db46 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -23168,6 +23168,8 @@ static void change_redirecting_information(struct sip_pvt *p, struct sip_request redirecting->from.number.valid = 1; ast_free(redirecting->from.number.str); redirecting->from.number.str = redirecting_from_number; + } else { + ast_free(redirecting_from_number); } if (!ast_strlen_zero(redirecting_from_name)) { ast_debug(3, "Got redirecting from name %s\n", redirecting_from_name); @@ -23175,6 +23177,8 @@ static void change_redirecting_information(struct sip_pvt *p, struct sip_request redirecting->from.name.valid = 1; ast_free(redirecting->from.name.str); redirecting->from.name.str = redirecting_from_name; + } else { + ast_free(redirecting_from_name); } if (!ast_strlen_zero(p->cid_tag)) { ast_free(redirecting->from.tag); @@ -23188,13 +23192,17 @@ static void change_redirecting_information(struct sip_pvt *p, struct sip_request redirecting->to.number.valid = 1; ast_free(redirecting->to.number.str); redirecting->to.number.str = redirecting_to_number; + } else { + ast_free(redirecting_to_number); } if (!ast_strlen_zero(redirecting_to_name)) { - ast_debug(3, "Got redirecting to name %s\n", redirecting_from_number); + ast_debug(3, "Got redirecting to name %s\n", redirecting_to_name); update_redirecting->to.name = 1; redirecting->to.name.valid = 1; ast_free(redirecting->to.name.str); redirecting->to.name.str = redirecting_to_name; + } else { + ast_free(redirecting_to_name); } redirecting->reason.code = reason; ast_free(redirecting->reason.str); @@ -24223,6 +24231,7 @@ static void handle_response_subscribe(struct sip_pvt *p, int resp, const char *r ast_cc_monitor_failed(monitor_instance->core_id, monitor_instance->device_name, "Received error response to our SUBSCRIBE"); + ao2_ref(monitor_instance, -1); } return; } |