Author: mikej Date: Sun May 25 11:17:55 2008 New Revision: 8630 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c Log: Thu May 22 06:47:07 EDT 2008 Pekka.Pessi@nokia.com * nua_stack.c: fixed klocwork issues Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Sun May 25 11:17:55 2008 @@ -1 +1 @@ -Sun May 25 11:17:06 EDT 2008 +Sun May 25 11:17:39 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c Sun May 25 11:17:55 2008 @@ -543,8 +543,6 @@ nua_event_t event; int error = 0; - assert(tags); - if (nh) { if (!nh->nh_prev) nh_append(nua, nh); @@ -1043,7 +1041,7 @@ SIPTAG_FROM(from), /* Remote AoR */ TAG_END()); - if (nua_stack_init_handle(nh->nh_nua, nh, NULL) < 0) + if (nh && nua_stack_init_handle(nua, nh, NULL) < 0) nh_destroy(nua, nh), nh = NULL; if (nh && create_dialog) { @@ -1860,8 +1858,6 @@ int terminated; int handle_can_be_terminated = initial && !sr->sr_event; - assert(nh); - if (sr->sr_application) { /* There was an error sending response */ if (sr->sr_application != sr->sr_status) @@ -2811,10 +2807,12 @@ char const *phrase, sip_t const *sip) { - nua_handle_t *nh = cr->cr_owner; + nua_handle_t *nh; assert(cr && status >= 200 && phrase && sip); + nh = cr->cr_owner; + if (cr->cr_retry_count > NH_PGET(nh, retry_count)) return 0;