May 2009 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r13332 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/soa
by FreeSWITCH SVN 15 May '09

15 May '09

Author: mikej Date: Fri May 15 11:02:34 2009 New Revision: 13332 Log: Tue May 12 14:57:48 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * soa_static.c: avoid overrun of arrays in soa_sdp_upgrade() Ignore-this: 9f7eae37e7d97c509a2797363b03c54a Coverity issue. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Fri May 15 11:02:34 2009 @@ -1 +1 @@ -Fri May 15 11:01:11 CDT 2009 +Fri May 15 11:02:00 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c Fri May 15 11:02:34 2009 @@ -716,7 +716,7 @@ { soa_static_session_t *sss = (soa_static_session_t *)ss; - int Ns, Nu, Nr, size, i, j; + int Ns, Nu, Nr, Nmax, n, i, j; sdp_media_t *m, **mm, *um; sdp_media_t **s_media, **o_media, **u_media; sdp_media_t const *rm, **r_media; @@ -730,13 +730,13 @@ Nr = sdp_media_count(remote, sdp_media_any, 0, 0, 0); if (remote == NULL) - size = Ns + Nu + 1; + Nmax = Ns + Nu; else if (Ns < Nr) - size = Nr + 1; + Nmax = Nr; else - size = Ns + 1; + Nmax = Ns; - s_media = su_zalloc(home, size * (sizeof *s_media)); + s_media = su_zalloc(home, (Nmax + 1) * (sizeof *s_media)); o_media = su_zalloc(home, (Ns + 1) * (sizeof *o_media)); u_media = su_zalloc(home, (Nu + 1) * (sizeof *u_media)); r_media = su_zalloc(home, (Nr + 1) * (sizeof *r_media)); @@ -748,17 +748,17 @@ return -1; u2s = su_alloc(home, (Nu + 1) * sizeof(*u2s)); - s2u = su_alloc(home, size * sizeof(*s2u)); + s2u = su_alloc(home, (Nmax + 1) * sizeof(*s2u)); if (!u2s || !s2u) return -1; for (i = 0; i < Nu; i++) u2s[i] = U2S_NOT_USED; - u2s[i] = U2S_SENTINEL; + u2s[Nu] = U2S_SENTINEL; - for (i = 0; i <= size; i++) + for (i = 0; i < Nmax; i++) s2u[i] = U2S_NOT_USED; - s2u[i] = U2S_SENTINEL; + s2u[Nmax] = U2S_SENTINEL; for (i = 0, m = session->sdp_media; m && i < Ns; m = m->m_next) o_media[i++] = m; @@ -778,6 +778,7 @@ continue; if (j >= Nu) /* lines removed from user SDP */ continue; + assert(i < Ns); s_media[i] = u_media[j], u_media[j] = SDP_MEDIA_NONE; u2s[j] = i, s2u[i] = j; } @@ -834,7 +835,7 @@ if (u_media[j] == SDP_MEDIA_NONE) continue; - for (i = 0; i < size - 1; i++) { + for (i = 0; i < Nmax; i++) { if (s_media[i] == NULL) { s_media[i] = u_media[j], u_media[j] = SDP_MEDIA_NONE; u2s[j] = i, s2u[i] = j; @@ -842,7 +843,7 @@ } } - assert(i != size - 1); + assert(i != Nmax); } } @@ -869,7 +870,7 @@ i++; } } - assert(i <= size); + assert(i <= Nmax); } mm = &session->sdp_media; @@ -878,7 +879,7 @@ } *mm = NULL; - s2u[size = i] = U2S_SENTINEL; + s2u[n = i] = U2S_SENTINEL; *return_u2s = u2s; *return_s2u = s2u; @@ -887,7 +888,7 @@ i = u2s[j]; assert(i == U2S_NOT_USED || s2u[i] == j); } - for (i = 0; i < size; i++) { + for (i = 0; i < n; i++) { j = s2u[i]; assert(j == U2S_NOT_USED || u2s[j] == i); }

1 0

[commit] r13331 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/tport
by FreeSWITCH SVN 15 May '09

15 May '09

Author: mikej Date: Fri May 15 11:01:31 2009 New Revision: 13331 Log: Tue May 12 13:23:33 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * tport.c: do not use out-of-scope array in tport_deliver() Ignore-this: a651d5eb213850d9dfd317102a432f8e Coverity issue. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Fri May 15 11:01:31 2009 @@ -1 +1 @@ -Fri May 15 10:59:42 CDT 2009 +Fri May 15 11:01:11 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c Fri May 15 11:01:31 2009 @@ -2952,6 +2952,7 @@ tport_t *ref; int error; struct tport_delivery *d; + char ipaddr[SU_ADDRSIZE + 2]; assert(msg); @@ -2962,7 +2963,6 @@ *d->d_from = *self->tp_name; if (tport_is_primary(self)) { - char ipaddr[SU_ADDRSIZE + 2]; su_sockaddr_t const *su = msg_addr(msg); #if SU_HAVE_IN6 @@ -3005,16 +3005,16 @@ ref = tport_incref(self); - if (self->tp_pri->pri_vtable->vtp_deliver) { self->tp_pri->pri_vtable->vtp_deliver(self, msg, now); } else tport_base_deliver(self, msg, now); - tport_decref(&ref); - + memset(d->d_from, 0, sizeof d->d_from); d->d_msg = NULL; + + tport_decref(&ref); } /** Pass message to the protocol stack */

1 0

[commit] r13330 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta
by FreeSWITCH SVN 15 May '09

15 May '09

Author: mikej Date: Fri May 15 11:00:17 2009 New Revision: 13330 Log: Tue May 12 13:17:07 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * nta.c: check input in nta_leg_by_uri() Ignore-this: f149ac04b5e1bf078c3b00e837738301 Coverity issue. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Fri May 15 11:00:17 2009 @@ -1 +1 @@ -Fri May 15 10:58:24 CDT 2009 +Fri May 15 10:59:42 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c Fri May 15 11:00:17 2009 @@ -4899,7 +4899,7 @@ nta_leg_t *nta_leg_by_uri(nta_agent_t const *agent, url_string_t const *us) { url_t *url; - nta_leg_t *leg; + nta_leg_t *leg = NULL; if (!agent) return NULL; @@ -4909,11 +4909,11 @@ url = url_hdup(NULL, us->us_url); - agent_aliases(agent, url, NULL); - - leg = url ? dst_find(agent, url, NULL) : NULL; - - su_free(NULL, url); + if (url) { + agent_aliases(agent, url, NULL); + leg = dst_find(agent, url, NULL); + su_free(NULL, url); + } return leg; }

1 0

[commit] r13329 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by FreeSWITCH SVN 15 May '09

15 May '09

Author: mikej Date: Fri May 15 10:59:02 2009 New Revision: 13329 Log: Tue May 12 13:13:16 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * nua_client.c: removed extra NULL check from nua_client_request_complete() Ignore-this: cc1f1fb7bf8e4ae07f965846418410a Coverity issue 7310. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Fri May 15 10:59:02 2009 @@ -1 +1 @@ -Fri May 15 10:57:19 CDT 2009 +Fri May 15 10:58:24 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c Fri May 15 10:59:02 2009 @@ -336,7 +336,8 @@ { if (cr->cr_orq) { nua_client_request_ref(cr); - if (cr && cr->cr_methods->crm_complete) + if (cr->cr_methods->crm_complete) + /* Calls nua_invite_client_complete() */ cr->cr_methods->crm_complete(cr); nua_client_request_clean(cr); if (nua_client_request_unref(cr))

1 0

[commit] r13328 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by FreeSWITCH SVN 15 May '09

15 May '09

Author: mikej Date: Fri May 15 10:57:37 2009 New Revision: 13328 Log: Tue May 12 13:07:45 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * nua_session.c: check dialog usage before using it in nua_update_server_respond() Ignore-this: 543e8d6d999a5a4d54600f1dbdfb1444 Coverity issue 7312. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Fri May 15 10:57:37 2009 @@ -1 +1 @@ -Fri May 15 10:54:18 CDT 2009 +Fri May 15 10:57:19 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Fri May 15 10:57:37 2009 @@ -3543,7 +3543,7 @@ } } - if (200 <= sr->sr_status && sr->sr_status < 300) { + if (ss && 200 <= sr->sr_status && sr->sr_status < 300) { session_timer_preferences(ss->ss_timer, sip, NH_PGET(nh, supported), @@ -3552,7 +3552,7 @@ NH_PGET(nh, refresher), NH_PGET(nh, min_se)); - if (ss && session_timer_is_supported(ss->ss_timer)) { + if (session_timer_is_supported(ss->ss_timer)) { nua_server_request_t *sr0; int uas;

1 0

[commit] r13327 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/tport
by FreeSWITCH SVN 15 May '09

15 May '09

Author: mikej Date: Fri May 15 10:54:54 2009 New Revision: 13327 Log: Tue May 12 13:04:33 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * tport_type_udp.c: tport_check_trunc() cleaned code Ignore-this: b39558360afb657325a4615d0919baaa Coverity issue. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Fri May 15 10:54:54 2009 @@ -1 +1 @@ -Fri May 15 10:53:11 CDT 2009 +Fri May 15 10:54:18 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c Fri May 15 10:54:54 2009 @@ -254,19 +254,15 @@ if (n != 4) return; - for (;;) { - n = su_recvfrom(tp->tp_socket, buffer, sizeof buffer, MSG_TRUNC, - (void *)&su, &sulen); - - if (n > (ssize_t)sizeof buffer) { - tp->tp_trunc = 1; - return; - } - - /* XXX - check that su and tp->tp_addrinfo->ai_addr match */ + n = su_recvfrom(tp->tp_socket, buffer, sizeof buffer, MSG_TRUNC, + (void *)&su, &sulen); + if (n > (ssize_t)sizeof buffer) { + tp->tp_trunc = 1; return; } + + /* XXX - check that su and tp->tp_addrinfo->ai_addr match */ #endif }

1 0

[commit] r13326 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by FreeSWITCH SVN 15 May '09

15 May '09

Author: mikej Date: Fri May 15 10:53:31 2009 New Revision: 13326 Log: Tue May 12 13:00:40 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * nua_session.c: removed dead code from process_prack() Ignore-this: 325e40cbba4e6933aa1681d6862533f Coverity issue. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Fri May 15 10:53:31 2009 @@ -1 +1 @@ -Fri May 15 10:51:24 CDT 2009 +Fri May 15 10:53:11 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Fri May 15 10:53:31 2009 @@ -2776,9 +2776,9 @@ sip_t const *sip) { nua_handle_t *nh; - nua_dialog_usage_t *du; nta_reliable_destroy(rel); + if (irq == NULL) /* Final response interrupted 100rel, we did not actually receive PRACK */ return 200; @@ -2793,8 +2793,6 @@ if (nh->nh_ds->ds_leg == NULL) return 500; - du = nua_dialog_usage_for_session(nh->nh_ds); - if (sip == NULL) { /* 100rel timeout */ SR_STATUS(sr, 504, "Reliable Response Timeout");

1 0

[commit] r13325 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by FreeSWITCH SVN 15 May '09

15 May '09

Author: mikej Date: Fri May 15 10:52:14 2009 New Revision: 13325 Log: Tue May 12 11:57:49 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * nua_session.c: doublecheck invite client transaction Ignore-this: 4236b668c99e6e0d72a7889ce6cdf671 Coverity issue. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Fri May 15 10:52:14 2009 @@ -1 +1 @@ -Fri May 15 10:49:56 CDT 2009 +Fri May 15 10:51:24 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Fri May 15 10:52:14 2009 @@ -1885,8 +1885,8 @@ } if (acked && - du->du_cr->cr_method == sip_method_invite && - nua_client_is_queued(du->du_cr)) { + nua_client_is_queued(du->du_cr) && + du->du_cr->cr_method == sip_method_invite) { /* New INVITE was queued - do not send UPDATE */ } else if (ss->ss_update_needed && 200 <= status && status < 300 &&

1 0

[commit] r13324 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by FreeSWITCH SVN 15 May '09

15 May '09

Author: mikej Date: Fri May 15 10:50:43 2009 New Revision: 13324 Log: Tue May 12 11:52:32 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * nua_session.c: always clean and remove INVITE client request in nua_invite_client_ack() Ignore-this: bdace77be7b43629b591f5adf7315341 Coverity issue. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Fri May 15 10:50:43 2009 @@ -1 +1 @@ -Fri May 15 10:49:06 CDT 2009 +Fri May 15 10:49:56 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Fri May 15 10:50:43 2009 @@ -1250,9 +1250,7 @@ if (!ds->ds_leg) { /* XXX - fix nua_dialog_usage_remove_at() instead! */ - nua_client_request_clean(cr); - nua_client_request_remove(cr); - return -1; + goto error; } assert(ds->ds_leg); @@ -1260,7 +1258,7 @@ msg = nta_outgoing_getrequest(cr->cr_orq); sip = sip_object(msg); if (!msg) - return -1; + goto error; invite_branch = nta_outgoing_branch(cr->cr_orq); wa = sip_authorization(sip); @@ -1271,7 +1269,7 @@ msg = nta_msg_create(nh->nh_nua->nua_nta, 0); sip = sip_object(msg); if (!msg) - return -1; + goto error; cseq = sip_cseq_create(msg_home(msg), cr->cr_seq, SIP_METHOD_ACK); @@ -1386,6 +1384,7 @@ if (error == -1) msg_destroy(msg); + error: cr->cr_acked = 1; /* ... or we have at least tried */ nua_client_request_clean(cr); @@ -1617,7 +1616,6 @@ } else if (cri->cr_status < 300 && !cri->cr_acked) { nua_invite_client_ack(cri, NULL); - nua_client_request_clean(cri); } } if (nua_client_create(nh, nua_r_bye, &nua_bye_client_methods, NULL) != 0) @@ -3418,7 +3416,6 @@ next_state = nua_callstate_ready; else next_state = nua_callstate_terminating; - nua_client_request_clean(du->du_cr); } }

1 0

[commit] r13323 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/iptsec
by FreeSWITCH SVN 15 May '09

15 May '09

Author: mikej Date: Fri May 15 10:49:34 2009 New Revision: 13323 Log: Tue May 12 11:38:36 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * auth_common.c::auth_get_params(): added missing va_end() Ignore-this: 43f33c9e069f4b80c35bab09bec7f925 Coverity issue. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_common.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Fri May 15 10:49:34 2009 @@ -1 +1 @@ -Fri May 15 10:47:06 CDT 2009 +Fri May 15 10:49:06 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_common.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_common.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_common.c Fri May 15 10:49:34 2009 @@ -125,8 +125,10 @@ else value = su_strdup(home, p + len); - if (value == NULL) + if (value == NULL) { + va_end(ap); return -1; + } break; }

1 0