Fix crash in res_pjsip_outbound_registration when the remote server can not be resolved.
authorJoshua Colp <jcolp@digium.com>
Tue, 6 Aug 2013 12:39:27 +0000 (12:39 +0000)
committerJoshua Colp <jcolp@digium.com>
Tue, 6 Aug 2013 12:39:27 +0000 (12:39 +0000)
This crash was caused by decrementing the reference count of a newly created message when
it should not be. This change fixes that but also fixes all other cases where this was
incorrectly done.

(closes issue ASTERISK-22188)
Reported by: Kinsey Moore

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396319 65c4cc65-6c06-0410-ace0-fbb531ad65f3

res/res_pjsip_exten_state.c
res/res_pjsip_messaging.c
res/res_pjsip_notify.c
res/res_pjsip_outbound_registration.c

index c921d44..483d78b 100644 (file)
@@ -250,7 +250,6 @@ static void create_send_notify(struct exten_state_subscription *exten_state_sub,
 
        if (ast_sip_subscription_send_request(exten_state_sub->sip_sub, tdata) != PJ_SUCCESS) {
                ast_log(LOG_WARNING, "Unable to send NOTIFY request\n");
-               pjsip_tx_data_dec_ref(tdata);
        }
 }
 
index 8f51512..a3972ce 100644 (file)
@@ -484,7 +484,6 @@ static int msg_send(void *data)
        update_from(tdata, mdata->from);
        vars_to_headers(mdata->msg, tdata);
        if (ast_sip_send_request(tdata, NULL, endpoint)) {
-               pjsip_tx_data_dec_ref(tdata);
                ast_log(LOG_ERROR, "SIP MESSAGE - Could not send request\n");
                return -1;
        }
index 2f0cfd3..c90a91b 100644 (file)
@@ -440,7 +440,6 @@ static int notify_contact(void *obj, void *arg, int flags)
        data->build_notify(tdata, data->info);
 
        if (ast_sip_send_request(tdata, NULL, data->endpoint)) {
-               pjsip_tx_data_dec_ref(tdata);
                ast_log(LOG_ERROR, "SIP NOTIFY - Unable to send request for "
                        "contact %s\n", contact->uri);
                return -1;
index d9c4f2b..67e0ead 100644 (file)
@@ -221,7 +221,6 @@ static int handle_client_registration(void *data)
        ao2_ref(client_state, +1);
        if (pjsip_regc_send(client_state->client, tdata) != PJ_SUCCESS) {
                ao2_ref(client_state, -1);
-               pjsip_tx_data_dec_ref(tdata);
        }
 
        return 0;