diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2016-09-21 15:10:29 -0500 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2016-11-10 17:15:59 -0500 |
| commit | bb196323f9383e34789e5e5c930c789dfb6f9096 (patch) | |
| tree | 779e2c311666f04ee0db3fb9553b8af07826f45e /res/res_pjsip_pubsub.c | |
| parent | 9df59d9ff41afdc732a2f8e91783c1e329b933fc (diff) | |
res_pjsip: Fix tdata leaks in off nominal paths.
Change-Id: Ie83e06e88c2d60157775263b07e40b61718ac97b
Diffstat (limited to 'res/res_pjsip_pubsub.c')
| -rw-r--r-- | res/res_pjsip_pubsub.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/res/res_pjsip_pubsub.c b/res/res_pjsip_pubsub.c index 015ef99c7..43a9d4ba6 100644 --- a/res/res_pjsip_pubsub.c +++ b/res/res_pjsip_pubsub.c @@ -1802,6 +1802,7 @@ static int sip_subscription_send_request(struct sip_subscription_tree *sub_tree, if (allocate_tdata_buffer(tdata)) { ast_log(LOG_ERROR, "SIP request %s is too large to send.\n", tdata->info); + pjsip_tx_data_dec_ref(tdata); return -1; } @@ -2912,7 +2913,6 @@ static struct ast_sip_publication *sip_create_publication(struct ast_sip_endpoin static int sip_publication_respond(struct ast_sip_publication *pub, int status_code, pjsip_rx_data *rdata) { - pj_status_t status; pjsip_tx_data *tdata; pjsip_transaction *tsx; @@ -2921,26 +2921,24 @@ static int sip_publication_respond(struct ast_sip_publication *pub, int status_c } if (PJSIP_IS_STATUS_IN_CLASS(status_code, 200)) { - RAII_VAR(char *, entity_tag, NULL, ast_free_ptr); - RAII_VAR(char *, expires, NULL, ast_free_ptr); + char buf[30]; - if ((ast_asprintf(&entity_tag, "%d", pub->entity_tag) < 0) || - (ast_asprintf(&expires, "%d", pub->expires) < 0)) { - pjsip_tx_data_dec_ref(tdata); - return -1; - } + snprintf(buf, sizeof(buf), "%d", pub->entity_tag); + ast_sip_add_header(tdata, "SIP-ETag", buf); - ast_sip_add_header(tdata, "SIP-ETag", entity_tag); - ast_sip_add_header(tdata, "Expires", expires); + snprintf(buf, sizeof(buf), "%d", pub->expires); + ast_sip_add_header(tdata, "Expires", buf); } - if ((status = pjsip_tsx_create_uas(&pubsub_module, rdata, &tsx)) != PJ_SUCCESS) { + if (pjsip_tsx_create_uas(&pubsub_module, rdata, &tsx) != PJ_SUCCESS) { + pjsip_tx_data_dec_ref(tdata); return -1; } pjsip_tsx_recv_msg(tsx, rdata); if (pjsip_tsx_send_msg(tsx, tdata) != PJ_SUCCESS) { + pjsip_tx_data_dec_ref(tdata); return -1; } |