May 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r8638 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/iptsec
by Freeswitch SVN 25 May '08

25 May '08

Author: mikej Date: Sun May 25 11:22:45 2008 New Revision: 8638 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_client.c Log: Thu May 22 10:38:43 EDT 2008 Pekka.Pessi(a)nokia.com * auth_client.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:22:45 2008 @@ -1 +1 @@ -Sun May 25 11:21:50 EDT 2008 +Sun May 25 11:22:40 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_client.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_client.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_client.c Sun May 25 11:22:45 2008 @@ -728,6 +728,9 @@ else basic = malloc(basiclen + 1); + if (basic == NULL) + return -1; + /* * Basic authentication consists of username and password separated by * colon and then base64 encoded.

1 0

[commit] r8637 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/iptsec
by Freeswitch SVN 25 May '08

25 May '08

Author: mikej Date: Sun May 25 11:22:16 2008 New Revision: 8637 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_module.c Log: Thu May 22 10:38:36 EDT 2008 Pekka.Pessi(a)nokia.com * auth_module.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:22:16 2008 @@ -1 +1 @@ -Sun May 25 11:21:21 EDT 2008 +Sun May 25 11:21:50 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_module.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_module.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_module.c Sun May 25 11:22:16 2008 @@ -537,11 +537,10 @@ if (n < 0 || n >= INT_MAX) continue; if (n >= upsize) { - upsize = n + 1; - userpass = realloc(userpass == buffer ? NULL : userpass, upsize); - if (userpass == NULL) - continue; - base64_d(userpass, upsize - 1, au->au_params[0]); + void *b = realloc(userpass == buffer ? NULL : userpass, upsize = n + 1); + if (b == NULL) + break; + base64_d(userpass = b, upsize - 1, au->au_params[0]); } userpass[n] = 0; if (!(pass = strchr(userpass, ':'))) @@ -1079,13 +1078,15 @@ if (!*pass || !*user) continue; - realm = ""; ident = ""; - - if ((realm = strchr(pass, ':'))) { + if ((realm = strchr(pass, ':'))) *realm++ = '\0'; - if ((ident = strchr(realm, ':'))) - *ident++ = '\0'; - } + else + realm = ""; + + if ((ident = strchr(realm, ':'))) + *ident++ = '\0'; + else + ident = ""; apw = fresh + i++;

1 0

[commit] r8636 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/msg
by Freeswitch SVN 25 May '08

25 May '08

Author: mikej Date: Sun May 25 11:21:26 2008 New Revision: 8636 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser.c Log: Thu May 22 10:38:06 EDT 2008 Pekka.Pessi(a)nokia.com * msg_parser.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:21:26 2008 @@ -1 +1 @@ -Sun May 25 11:20:57 EDT 2008 +Sun May 25 11:21:21 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser.c Sun May 25 11:21:26 2008 @@ -1312,8 +1312,8 @@ char b[], isize_t bsiz, int eos) { - msg_mclass_t const *mc = msg->m_class; - msg_href_t const *hr = mc->mc_payload; + msg_mclass_t const *mc; + msg_href_t const *hr; msg_header_t *h, *h0; msg_payload_t *pl; char *x; @@ -1322,6 +1322,8 @@ return -1; assert(!msg->m_chunk); + mc = msg->m_class; + hr = mc->mc_payload; if (return_payload == NULL) return_payload = &h0; @@ -1334,7 +1336,7 @@ return -1; append_parsed(msg, mo, hr, h, 0); - pl = h->sh_payload; + pl = (msg_payload_t*)h; *return_payload = h; if (bsiz >= body_len) { @@ -1832,9 +1834,15 @@ else bsiz = used + n + 1; + if (bsiz < msg_min_size) { + errno = ENOMEM; + su_free(home, b); + return NULL; + } + b2 = su_realloc(home, b, bsiz); - if (b2 == NULL || bsiz < msg_min_size) { + if (b2 == NULL) { errno = ENOMEM; su_free(home, b); return NULL; @@ -1896,7 +1904,7 @@ msg_header_t **separator; msg_header_t **payload; msg_header_t **multipart; - msg_mclass_t const *mc = msg->m_class; + msg_mclass_t const *mc; msg_header_t **tail, ***ptail; if (!msg) @@ -1914,6 +1922,7 @@ serialize_first(msg, h); + mc = msg->m_class; separator = (msg_header_t **)((char *)pub + mc->mc_separator->hr_offset); payload = (msg_header_t **)((char *)pub + mc->mc_payload->hr_offset); if (mc->mc_multipart->hr_class) @@ -2115,13 +2124,14 @@ msg_header_t **head, msg_header_t *h) { - msg_mclass_t const *mc = msg->m_class; + msg_mclass_t const *mc; msg_header_t **hh; msg_header_t **separator; msg_header_t **payload; assert(msg && pub && head && h); + mc = msg->m_class; separator = (msg_header_t **)((char *)pub + mc->mc_separator->hr_offset); payload = (msg_header_t **)((char *)pub + mc->mc_payload->hr_offset);

1 0

[commit] r8635 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/msg
by Freeswitch SVN 25 May '08

25 May '08

Author: mikej Date: Sun May 25 11:21:02 2008 New Revision: 8635 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser_util.c Log: Thu May 22 10:37:27 EDT 2008 Pekka.Pessi(a)nokia.com * msg_parser_util.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:21:02 2008 @@ -1 +1 @@ -Sun May 25 11:20:14 EDT 2008 +Sun May 25 11:20:57 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser_util.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser_util.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser_util.c Sun May 25 11:21:02 2008 @@ -191,9 +191,9 @@ issize_t (*scanner)(char *s), int sep) { - char const *auto_list[MSG_N_PARAMS]; - char const **list = auto_list, **re_list; - int N = MSG_N_PARAMS, n = 0; + char const *stack[MSG_N_PARAMS]; + char const **list = stack, **re_list; + size_t N = MSG_N_PARAMS, n = 0; issize_t tlen; char *s = *ss; char const **start; @@ -221,7 +221,7 @@ if (tlen > 0) { if (n + 1 == N) { /* Reallocate list? */ N = MSG_PARAMS_NUM(N + 1); - if (list == auto_list || list == *append_list) { + if (list == stack || list == *append_list) { re_list = su_alloc(home, N * sizeof(*list)); if (re_list) memcpy(re_list, list, n * sizeof(*list)); @@ -247,23 +247,25 @@ *ss = s; - if (n > 0 && list == auto_list) { + if (n == 0) { + *append_list = NULL; + return 0; + } + + if (list == stack) { size_t size = sizeof(*list) * MSG_PARAMS_NUM(n + 1); list = su_alloc(home, size); if (!list) return -1; - memcpy((void *)list, auto_list, n * sizeof(*list)); + memcpy((void *)list, stack, n * sizeof(*list)); } list[n] = NULL; - if (n == 0) - list = NULL; - *append_list = list; return 0; error: *start = NULL; - if (list != auto_list && list != *append_list) + if (list != stack && list != *append_list) su_free(home, list); return -1; } @@ -362,7 +364,8 @@ for (n = 0; params[n]; n++) ; N = MSG_PARAMS_NUM(n + 1); - } else { + } + else { params = stack; N = MSG_PARAMS_NUM(1); }

1 0

[commit] r8634 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nea
by Freeswitch SVN 25 May '08

25 May '08

Author: mikej Date: Sun May 25 11:20:34 2008 New Revision: 8634 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nea/nea_server.c Log: Thu May 22 10:36:30 EDT 2008 Pekka.Pessi(a)nokia.com * nea_server.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:20:34 2008 @@ -1 +1 @@ -Sun May 25 11:19:51 EDT 2008 +Sun May 25 11:20:14 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nea/nea_server.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nea/nea_server.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nea/nea_server.c Sun May 25 11:20:34 2008 @@ -1493,8 +1493,9 @@ nta_incoming_t *irq, sip_t const *sip) { - nea_sub_t *s = NULL; - s = nea_sub_create(nes); + nea_sub_t *s = nea_sub_create(nes); + if (s == NULL) + return 500; s->s_from = sip_from_dup(nes->nes_home, sip->sip_from);

1 0

[commit] r8633 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta
by Freeswitch SVN 25 May '08

25 May '08

Author: mikej Date: Sun May 25 11:19:57 2008 New Revision: 8633 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c Log: Thu May 22 09:39:19 EDT 2008 Pekka.Pessi(a)nokia.com * nta.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:19:57 2008 @@ -1 +1 @@ -Sun May 25 11:18:13 EDT 2008 +Sun May 25 11:19:51 EDT 2008 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 Sun May 25 11:19:57 2008 @@ -3310,7 +3310,7 @@ url_t reg_url[1]; url_string_t const *original = request_uri; - if (!leg || !msg) + if (!leg || !msg || !sip) return -1; if (!sip->sip_route && leg->leg_route) { @@ -4722,7 +4722,7 @@ irq->irq_record_route = sip_record_route_copy(home, sip->sip_record_route); } - irq->irq_branch = irq->irq_via->v_branch; + irq->irq_branch = sip->sip_via->v_branch; irq->irq_reliable_tp = tport_is_reliable(tport); if (sip->sip_timestamp) @@ -5822,7 +5822,7 @@ msg = nta_msg_create(irq->irq_agent, 0); sip = sip_object(msg); - if (status != 0) + if (sip && status != 0) sip->sip_status = sip_status_create(msg_home(msg), status, phrase, NULL); if (nta_incoming_response_headers(irq, msg, sip) < 0) @@ -5905,7 +5905,7 @@ return -1; } - if (msg == NULL) + if (msg == NULL || sip == NULL) return -1; if (msg == irq->irq_response) @@ -8403,6 +8403,8 @@ if (!internal && orq->orq_delay == UINT_MAX) outgoing_estimate_delay(orq, sip); + assert(!internal || status >= 300); + if (orq->orq_cc) agent_accept_compressed(orq->orq_agent, msg, orq->orq_cc); @@ -9549,6 +9551,9 @@ rlen = strlen(na->na_replace) + 1; sq = su_zalloc(home, (sizeof *sq) + rlen); + if (sq == NULL) + continue; + *tail = sq, tail = &sq->sq_next; sq->sq_otype = sres_type_naptr; sq->sq_priority = na->na_prefer;

1 0

[commit] r8632 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/http
by Freeswitch SVN 25 May '08

25 May '08

Author: mikej Date: Sun May 25 11:19:14 2008 New Revision: 8632 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/http/http_tag_class.c Log: Thu May 22 07:34:11 EDT 2008 Pekka.Pessi(a)nokia.com * http_tag_class.c: fixed klocwork issues Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/http/http_tag_class.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/http/http_tag_class.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/http/http_tag_class.c Sun May 25 11:19:14 2008 @@ -117,10 +117,13 @@ http_header_t const *h, **hh; http = (http_t const *)src->t_value; + if (http == NULL) + return dst; + mc = (void *)http->http_common->h_class; hh = (void *)msg_hclass_offset(mc, http, hc); - if (http == NULL || + if (hh == NULL || (char *)hh >= ((char *)http + http->http_size) || (char *)hh < (char *)&http->http_request) return dst;

1 0

[commit] r8631 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by Freeswitch SVN 25 May '08

25 May '08

Author: mikej Date: Sun May 25 11:18:36 2008 New Revision: 8631 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c Log: Thu May 22 06:48:11 EDT 2008 Pekka.Pessi(a)nokia.com * outbound.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:18:36 2008 @@ -1 +1 @@ -Sun May 25 11:17:39 EDT 2008 +Sun May 25 11:18:13 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c Sun May 25 11:18:36 2008 @@ -723,6 +723,9 @@ unsigned d = ob->ob_keepalive.interval; + if (msg == NULL) + return -1; + assert(regsip); assert(regsip->sip_request); if (m && m->m_params) { @@ -842,6 +845,13 @@ if (status < 200) return 0; + if (sip == NULL) { + SU_DEBUG_3(("outbound(%p): keepalive %u %s\n", (void *)ob->ob_owner, + status, phrase)); + ob->ob_oo->oo_keepalive_error(ob->ob_owner, ob, status, phrase, TAG_END()); + return 0; + } + if (status == 401 || status == 407) { if (sip->sip_www_authenticate) challenged += auc_challenge(ob->ob_keepalive.auc,

1 0

[commit] r8630 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by Freeswitch SVN 25 May '08

25 May '08

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(a)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;

1 0

[commit] r8629 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta
by Freeswitch SVN 25 May '08

25 May '08

Author: mikej Date: Sun May 25 11:17:18 2008 New Revision: 8629 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c Log: Thu May 22 06:46:18 EDT 2008 Pekka.Pessi(a)nokia.com * nta.c: fixed klocwork issue in nta_outgoing_prack() 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:18 2008 @@ -1 +1 @@ -Sun May 25 11:14:58 EDT 2008 +Sun May 25 11:17:06 EDT 2008 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 Sun May 25 11:17:18 2008 @@ -10668,9 +10668,9 @@ } if (rack) { - rack->ra_cseq = orq->orq_cseq->cs_seq; - rack->ra_method = orq->orq_cseq->cs_method; - rack->ra_method_name = orq->orq_cseq->cs_method_name; + rack->ra_cseq = oorq->orq_cseq->cs_seq; + rack->ra_method = oorq->orq_cseq->cs_method; + rack->ra_method_name = oorq->orq_cseq->cs_method_name; } }

1 0