May 2009 - Freeswitch-svn - FreeSWITCH Mailing Lists

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

15 May '09

Author: mikej Date: Fri May 15 11:17:09 2009 New Revision: 13352 Log: Wed May 13 13:33:21 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * sres.c: use unsigned lenghts with m_get_string() and m_get_domain() Ignore-this: 7b09dd7d26a10dabb645156563c0cd6c Coverity issue. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.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:17:09 2009 @@ -1 +1 @@ -Fri May 15 11:16:18 CDT 2009 +Fri May 15 11:17:02 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c Fri May 15 11:17:09 2009 @@ -543,8 +543,8 @@ static uint16_t m_get_uint16(sres_message_t *m); static uint8_t m_get_uint8(sres_message_t *m); -static int m_get_string(char *d, int n, sres_message_t *m, uint16_t offset); -static int m_get_domain(char *d, int n, sres_message_t *m, uint16_t offset); +static unsigned m_get_string(char *d, unsigned n, sres_message_t *m, uint16_t offset); +static unsigned m_get_domain(char *d, unsigned n, sres_message_t *m, uint16_t offset); /* ---------------------------------------------------------------------- */ @@ -3673,7 +3673,7 @@ uint16_t m_size; char name[1025]; - int len; + unsigned len; char btype[8], bclass[8]; sr = memset(sr0, 0, sizeof sr0); @@ -3686,7 +3686,10 @@ sr->sr_parsed = 1; if (m->m_error) goto error; - + if (len >= (sizeof name)) { + m->m_error = "too long domain name in record"; + goto error; + } name[len] = 0; SU_DEBUG_9(("%s RR received %s %s %s %d rdlen=%d\n", @@ -3766,7 +3769,7 @@ sres_message_t *m) { uint16_t moffset, roffset; - int mnamelen, rnamelen; + unsigned mnamelen, rnamelen; soa->soa_record->r_size = sizeof *soa; @@ -3818,8 +3821,8 @@ sres_message_t *m) { - int suffixlen = 0, i; - int prefixlen = 0; + unsigned suffixlen = 0, i; + unsigned prefixlen = 0; uint16_t offset; a6->a6_record->r_size = sizeof *a6; @@ -3876,7 +3879,7 @@ sres_message_t *m) { uint16_t offset; - int dlen; + unsigned dlen; cn->cn_record->r_size = sizeof *cn; @@ -3898,7 +3901,7 @@ sres_message_t *m) { uint16_t offset; - int dlen; + unsigned dlen; ptr->ptr_record->r_size = sizeof *ptr; @@ -3920,7 +3923,7 @@ sres_message_t *m) { uint16_t offset; - int dlen; + unsigned dlen; srv->srv_record->r_size = sizeof *srv; @@ -3944,7 +3947,7 @@ sres_message_t *m) { uint16_t offset[4]; - int len[4]; + unsigned len[4]; na->na_record->r_size = sizeof *na; @@ -4186,10 +4189,11 @@ /** * Get a string. */ -static int m_get_string(char *d, - int n, - sres_message_t *m, - uint16_t offset) +static unsigned +m_get_string(char *d, + unsigned n, + sres_message_t *m, + uint16_t offset) { uint8_t size; uint8_t *p = m->m_data; @@ -4231,13 +4235,14 @@ * * @param offset start uncompression from this point in message */ -static int m_get_domain(char *d, - int n, - sres_message_t *m, - uint16_t offset) +static unsigned +m_get_domain(char *d, + unsigned n, + sres_message_t *m, + uint16_t offset) { uint8_t cnt; - int i = 0; + unsigned i = 0; uint8_t *p = m->m_data; uint16_t new_offset; int save_offset;

1 0

[commit] r13351 - in freeswitch/trunk/libs/sofia-sip: . utils
by FreeSWITCH SVN 15 May '09

15 May '09

Author: mikej Date: Fri May 15 11:16:35 2009 New Revision: 13351 Log: Wed May 13 13:21:12 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * sip-date.c: not using uninit data. Ignore-this: 48751cc510886e42e23e48c535a869bc Coverity issue. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/utils/sip-date.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:16:35 2009 @@ -1 +1 @@ -Fri May 15 11:15:49 CDT 2009 +Fri May 15 11:16:18 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/utils/sip-date.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/utils/sip-date.c (original) +++ freeswitch/trunk/libs/sofia-sip/utils/sip-date.c Fri May 15 11:16:35 2009 @@ -99,7 +99,7 @@ int main(int ac, char *av[]) { int numeric = 0; - sip_time_t t, t2; + sip_time_t t = 0, t2 = 0; char const *s; char buf[1024]; @@ -132,8 +132,6 @@ } else { for (; *s; ) { - t2 = 0; - if (msg_delta_d(&s, &t2) < 0) usage();

1 0

[commit] r13350 - in freeswitch/trunk/libs/sofia-sip: . utils
by FreeSWITCH SVN 15 May '09

15 May '09

Author: mikej Date: Fri May 15 11:15:58 2009 New Revision: 13350 Log: Wed May 13 13:20:54 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * sip-dig.c: fixed crash on bad param Ignore-this: 9e73dd7095a51d15e5bc6f00e8aab98c Coverity issue. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/utils/sip-dig.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:15:58 2009 @@ -1 +1 @@ -Fri May 15 11:14:57 CDT 2009 +Fri May 15 11:15:49 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/utils/sip-dig.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/utils/sip-dig.c (original) +++ freeswitch/trunk/libs/sofia-sip/utils/sip-dig.c Fri May 15 11:15:58 2009 @@ -303,7 +303,7 @@ if (uri && uri->url_type == url_unknown) url_sanitize(uri); - if (uri->url_type == url_any) + if (uri && uri->url_type == url_any) continue; if (!uri || (uri->url_type != url_sip && uri->url_type != url_sips)) {

1 0

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

15 May '09

Author: mikej Date: Fri May 15 11:15:28 2009 New Revision: 13349 Log: Wed May 13 13:18:14 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * msg_mclass_insert_header(): not using uninit data Ignore-this: 40a6993391b5f2993af8ee01c407c0c7 Coverity issue. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_mclass.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:15:28 2009 @@ -1 +1 @@ -Fri May 15 11:14:26 CDT 2009 +Fri May 15 11:14:57 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_mclass.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_mclass.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_mclass.c Fri May 15 11:15:28 2009 @@ -164,25 +164,7 @@ msg_hclass_t *hc, unsigned short offset) { - msg_href_t hr[1]; - - if (mc == NULL || hc == NULL) { - errno = EINVAL; - return -1; - } - - if (msg_hclass_offset(mc, NULL, hc)) - return (void)(errno = EEXIST), -1; - - if (offset == 0) - offset = mc->mc_msize, mc->mc_msize += sizeof(msg_header_t *); - - assert(offset < mc->mc_msize); - - hr->hr_class = hc; - hr->hr_offset = offset; - - return msg_mclass_insert(mc, hr); + return msg_mclass_insert_with_mask(mc, hc, offset, 0); } /**Add a new header to the message class.

1 0

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

15 May '09

Author: mikej Date: Fri May 15 11:14:33 2009 New Revision: 13348 Log: Wed May 13 13:08:11 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * sres_resolver_new_with_cache_va(): added missing va_end() Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.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:14:33 2009 @@ -1 +1 @@ -Fri May 15 11:13:34 CDT 2009 +Fri May 15 11:14:26 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c Fri May 15 11:14:33 2009 @@ -707,6 +707,8 @@ if (olist != oarray) free(olist); + va_end(va0); + return res; }

1 0

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

15 May '09

Author: mikej Date: Fri May 15 11:14:01 2009 New Revision: 13347 Log: Wed May 13 13:07:25 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * nea_server.c: check params in nea_event_tcreate() Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nea/nea_server.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:14:01 2009 @@ -1 +1 @@ -Fri May 15 11:13:02 CDT 2009 +Fri May 15 11:13:34 CDT 2009 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 Fri May 15 11:14:01 2009 @@ -1222,6 +1222,9 @@ size_t len = strlen(name); ta_list ta; + if (nes == NULL || callback == NULL || name == NULL) + return NULL; + /* Find a matching event */ if (subname == NULL) { for (pev = &nes->nes_events; (ev = *pev); pev = &(*pev)->ev_next) {

1 0

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

15 May '09

Author: mikej Date: Fri May 15 11:13:20 2009 New Revision: 13346 Log: Wed May 13 13:02:06 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * msg_parser_util.c: fixed msg_unquoted_e() Ignore-this: 78b9afb6e97ff730d7924d860ef33921 Now accepts NULL buffer with nonzero size. Coverity issue. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser_util.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/test_msg.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:13:20 2009 @@ -1 +1 @@ -Fri May 15 11:12:29 CDT 2009 +Fri May 15 11:13:02 CDT 2009 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 Fri May 15 11:13:20 2009 @@ -1741,35 +1741,37 @@ /** Quote string */ issize_t msg_unquoted_e(char *b, isize_t bsiz, char const *s) { - char *begin = b; - char *end = b + bsiz; + isize_t e = 0; - if (b && b + 1 < end) + if (b == NULL) + bsiz = 0; + + if (0 < bsiz) *b = '"'; - b++; + e++; for (;*s;) { size_t n = strcspn(s, "\"\\"); if (n == 0) { - if (b && b + 2 < end) - b[0] = '\\', b[1] = s[0]; - b += 2; + if (e + 2 <= bsiz) + b[e] = '\\', b[e + 1] = s[0]; + e += 2; s++; } else { - if (b && b + n < end) - memcpy(b, s, n); - b += n; + if (e + n <= bsiz) + memcpy(b + e, s, n); + e += n; s += n; } } - if (b && b + 1 < end) - *b = '"'; - b++; + if (e < bsiz) + b[e] = '"'; + e++; - return b - begin; + return e; } Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/test_msg.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/test_msg.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/test_msg.c Fri May 15 11:13:20 2009 @@ -496,6 +496,22 @@ su_home_deinit(home); } + { + char b[8]; + TEST(msg_unquoted_e(NULL, 0, "\"\""), 6); + TEST(msg_unquoted_e(b, 0, "\"\""), 6); + TEST(msg_unquoted_e(b, 4, "\"\""), 6); + TEST(msg_unquoted_e(b, 6, "\"\""), 6); + TEST(memcmp(b, "\"\\\"\\\"\"", 6), 0); + TEST(msg_unquoted_e(b, 4, "\""), 4); + memset(b, 0, sizeof b); + TEST(msg_unquoted_e(b, 1, "\"kuik"), 8); + TEST(memcmp(b, "\"\0", 2), 0); + TEST(msg_unquoted_e(b, 3, "\"kuik"), 8); + TEST(memcmp(b, "\"\\\"\0", 4), 0); + TEST(msg_unquoted_e(b, 7, "\"kuik"), 8); + TEST(memcmp(b, "\"\\\"kuik\0", 8), 0); + } END(); }

1 0

[commit] r13345 - 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:12:41 2009 New Revision: 13345 Log: Wed May 13 12:35:38 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * nta_incoming_create_response(): sanitized oom check 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:12:41 2009 @@ -1 +1 @@ -Fri May 15 11:11:24 CDT 2009 +Fri May 15 11:12:29 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:12:41 2009 @@ -6386,11 +6386,13 @@ msg = nta_msg_create(irq->irq_agent, 0); sip = sip_object(msg); - if (sip && status != 0) - sip->sip_status = sip_status_create(msg_home(msg), status, phrase, NULL); + if (sip) { + if (status != 0) + sip->sip_status = sip_status_create(msg_home(msg), status, phrase, NULL); - if (nta_incoming_response_headers(irq, msg, sip) < 0) - msg_destroy(msg), msg = NULL; + if (nta_incoming_response_headers(irq, msg, sip) < 0) + msg_destroy(msg), msg = NULL; + } } return msg;

1 0

[commit] r13344 - 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 11:11:57 2009 New Revision: 13344 Log: Wed May 13 12:14:18 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * nua_event_server.c: free temp strings Ignore-this: 18b592f7d6ae942a48cd117f7a6f3c31 Coverity issue. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_event_server.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:11:57 2009 @@ -1 +1 @@ -Fri May 15 11:10:31 CDT 2009 +Fri May 15 11:11:24 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_event_server.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_event_server.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_event_server.c Fri May 15 11:11:57 2009 @@ -144,9 +144,13 @@ char const *ct_s = NULL; if (ev == NULL) { - char *o_type = su_strdup(home, event->o_type); - char *o_subtype = o_type ? strchr(o_type, '.') : NULL; + char *o_type, *o_subtype; + char *temp = NULL; + o_type = su_strdup(home, event->o_type); + if (o_type == NULL) + return NULL; + o_subtype = strchr(o_type, '.'); if (o_subtype) *o_subtype++ = '\0'; @@ -162,7 +166,7 @@ * types */ if (accept_s == NULL && accept) - accept_s = sip_header_as_string(home, (sip_header_t *)accept); + accept_s = temp = sip_header_as_string(home, (sip_header_t *)accept); if (accept_s == NULL && ct) accept_s = ct->c_type; if (accept_s == NULL && ct_s) @@ -173,6 +177,9 @@ o_type, o_subtype, ct ? ct->c_type : ct_s, accept_s); + + su_free(home, temp); + su_free(home, o_type); } return ev;

1 0

[commit] r13343 - 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 11:10:38 2009 New Revision: 13343 Log: Wed May 13 12:04:15 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * nua_update_server_report(): fix bugs checking pending INVITEs in fake precondition handling Ignore-this: dc67f6287bf48aa8e2a39e2ece96821 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 11:10:38 2009 @@ -1 +1 @@ -Fri May 15 11:09:32 CDT 2009 +Fri May 15 11:10:31 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 11:10:38 2009 @@ -3622,7 +3622,7 @@ && NH_PGET(nh, auto_alert)) { nua_server_request_t *sri; - for (sri = nh->nh_ds->ds_sr; sri; sri = sr->sr_next) + for (sri = nh->nh_ds->ds_sr; sri; sri = sri->sr_next) if (sri->sr_method == sip_method_invite && nua_server_request_is_pending(sri)) break;

1 0