sr-dev July 2017

sr-dev@lists.kamailio.org

23 participants
411 discussions

git:master:35d2d50c: topos: handle return code for parse_headers()
by Daniel-Constantin Mierla 20 Jul '17

20 Jul '17

Module: kamailio Branch: master Commit: 35d2d50ca5a170bb6518c45bec482a8cd7625177 URL: https://github.com/kamailio/kamailio/commit/35d2d50ca5a170bb6518c45bec482a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-20T16:25:42+02:00 topos: handle return code for parse_headers() --- Modified: src/modules/topos/topos_mod.c Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/35d2d50ca5a170bb6518c45bec482a8… Patch: https://github.com/kamailio/kamailio/commit/35d2d50ca5a170bb6518c45bec482a8… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index dfa8a7736f..0141c0f2c3 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -240,19 +240,21 @@ int tps_prepare_msg(sip_msg_t *msg) return 1; } - if (parse_headers(msg, HDR_EOH_F, 0)==-1) { - LM_DBG("parsing headers failed [[%.*s]]\n", - msg->len, msg->buf); - return 2; + if(parse_headers(msg, HDR_VIA2_F, 0)<0) { + LM_DBG("no via2 has been parsed\n"); } - parse_headers(msg, HDR_VIA2_F, 0); - if(parse_headers(msg, HDR_CSEQ_F, 0)!=0 || msg->cseq==NULL) { LM_ERR("cannot parse cseq header\n"); return -1; } + if (parse_headers(msg, HDR_EOH_F, 0)==-1) { + LM_DBG("parsing headers failed [[%.*s]]\n", + msg->len, msg->buf); + return 2; + } + if(parse_from_header(msg)<0) { LM_ERR("cannot parse FROM header\n"); return 3; diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 09eda9e1b3..37b075ae94 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -115,7 +115,10 @@ int tps_remove_headers(sip_msg_t *msg, uint32_t hdr) struct hdr_field *hf; struct lump* l; - parse_headers(msg, HDR_EOH_F, 0); + if(parse_headers(msg, HDR_EOH_F, 0)<0) { + LM_ERR("failed to parse headers\n"); + return -1; + } for (hf=msg->headers; hf; hf=hf->next) { if (hdr!=hf->type) continue; @@ -139,7 +142,11 @@ int tps_add_headers(sip_msg_t *msg, str *hname, str *hbody, int hpos) if(hname==NULL || hname->len<=0 || hbody==NULL || hbody->len<=0) return 0; - parse_headers(msg, HDR_EOH_F, 0); + if(parse_headers(msg, HDR_EOH_F, 0)<0) { + LM_ERR("failed to parse headers\n"); + return -1; + } + if(hpos == 0) { /* append */ /* after last header */ anchor = anchor_lump(msg, msg->unparsed - msg->buf, 0, 0);

1 0

git:master:af9c9c47: core: adjustments for cleaner compiler analyzing reports
by Daniel-Constantin Mierla 20 Jul '17

20 Jul '17

Module: kamailio Branch: master Commit: af9c9c4798972f0112e7644bfa78e34476f77bda URL: https://github.com/kamailio/kamailio/commit/af9c9c4798972f0112e7644bfa78e34… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-20T13:12:06+02:00 core: adjustments for cleaner compiler analyzing reports --- Modified: src/core/dns_cache.c Modified: src/core/kemi.c Modified: src/core/select_core.c Modified: src/core/tcp_main.c Modified: src/core/usr_avp.c --- Diff: https://github.com/kamailio/kamailio/commit/af9c9c4798972f0112e7644bfa78e34… Patch: https://github.com/kamailio/kamailio/commit/af9c9c4798972f0112e7644bfa78e34…

1 0

git:master:42d74f35: uid_avp_db: better error handling
by Daniel-Constantin Mierla 20 Jul '17

20 Jul '17

Module: kamailio Branch: master Commit: 42d74f35e4d7be9f46314c1805a77983a7cdf6fb URL: https://github.com/kamailio/kamailio/commit/42d74f35e4d7be9f46314c1805a7798… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-20T09:31:49+02:00 uid_avp_db: better error handling --- Modified: src/modules/uid_avp_db/extra_attrs.c --- Diff: https://github.com/kamailio/kamailio/commit/42d74f35e4d7be9f46314c1805a7798… Patch: https://github.com/kamailio/kamailio/commit/42d74f35e4d7be9f46314c1805a7798… --- diff --git a/src/modules/uid_avp_db/extra_attrs.c b/src/modules/uid_avp_db/extra_attrs.c index 888f84d675..6a88655c70 100644 --- a/src/modules/uid_avp_db/extra_attrs.c +++ b/src/modules/uid_avp_db/extra_attrs.c @@ -175,7 +175,8 @@ int declare_attr_group(modparam_t type, char* _param) } while (p); if ((!rt->id) || (!rt->flag_name)) { - ERR("at least attribute group ID and flags must ve given\n"); + ERR("at least attribute group ID and flags must be given\n"); + pkg_free(rt); return -1; } /* insert new element into registered tables */ @@ -449,6 +450,12 @@ int init_extra_avp_locks() int i; registered_table_t *t = tables; + if(register_script_cb(avpdb_post_script_cb, + REQUEST_CB | ONREPLY_CB | POST_SCRIPT_CB, 0)<0) { + LM_ERR("failed to register script callbacks\n"); + return -1; + } + /* zero all 'lock counters' */ memset(lock_counters, 0, sizeof(lock_counters)); @@ -468,8 +475,6 @@ int init_extra_avp_locks() t = t->next; } - register_script_cb(avpdb_post_script_cb, REQUEST_CB | ONREPLY_CB | POST_SCRIPT_CB, 0); - return 0; }

1 0

git:master:c5cdd8dc: uid_domain: avoid double free in case of error
by Daniel-Constantin Mierla 20 Jul '17

20 Jul '17

Module: kamailio Branch: master Commit: c5cdd8dce66d94f69f773b5361ef2b477df47f06 URL: https://github.com/kamailio/kamailio/commit/c5cdd8dce66d94f69f773b5361ef2b4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-20T09:31:49+02:00 uid_domain: avoid double free in case of error --- Modified: src/modules/uid_domain/domain.c --- Diff: https://github.com/kamailio/kamailio/commit/c5cdd8dce66d94f69f773b5361ef2b4… Patch: https://github.com/kamailio/kamailio/commit/c5cdd8dce66d94f69f773b5361ef2b4… --- diff --git a/src/modules/uid_domain/domain.c b/src/modules/uid_domain/domain.c index e654adf321..0c4332a106 100644 --- a/src/modules/uid_domain/domain.c +++ b/src/modules/uid_domain/domain.c @@ -244,7 +244,7 @@ int load_domains(domain_t** dest) list = 0; - if (db_exec(&res, load_domains_cmd) < 0) { + if ((db_exec(&res, load_domains_cmd) < 0) || (res==NULL)) { ERR("Error while querying database\n"); return -1; } @@ -292,6 +292,7 @@ int load_domains(domain_t** dest) } db_res_free(res); + res = NULL; if (load_domain_attrs) { d = list;

1 0

git:master:dadd54a4: xmpp: close fd in case of write error
by Daniel-Constantin Mierla 20 Jul '17

20 Jul '17

Module: kamailio Branch: master Commit: dadd54a46f81ef05478e622a89a3bb739907cade URL: https://github.com/kamailio/kamailio/commit/dadd54a46f81ef05478e622a89a3bb7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-20T09:31:49+02:00 xmpp: close fd in case of write error --- Modified: src/modules/xmpp/xode_from.c --- Diff: https://github.com/kamailio/kamailio/commit/dadd54a46f81ef05478e622a89a3bb7… Patch: https://github.com/kamailio/kamailio/commit/dadd54a46f81ef05478e622a89a3bb7… --- diff --git a/src/modules/xmpp/xode_from.c b/src/modules/xmpp/xode_from.c index f2d9b54569..8a78f4ba4d 100644 --- a/src/modules/xmpp/xode_from.c +++ b/src/modules/xmpp/xode_from.c @@ -225,8 +225,10 @@ int xode_to_file(char *file, xode node) doc = xode_to_str(node); i = write(fd,doc,strlen(doc)); - if(i < 0) + if(i < 0) { + close(fd); return -1; + } close(fd); return 1;

1 0

git:master:a859ff6e: xprint: safety checks for error cases
by Daniel-Constantin Mierla 20 Jul '17

20 Jul '17

Module: kamailio Branch: master Commit: a859ff6e74b0cdc08f30c43adda865a74283b3c4 URL: https://github.com/kamailio/kamailio/commit/a859ff6e74b0cdc08f30c43adda865a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-20T09:31:49+02:00 xprint: safety checks for error cases --- Modified: src/modules/xprint/xp_lib.c --- Diff: https://github.com/kamailio/kamailio/commit/a859ff6e74b0cdc08f30c43adda865a… Patch: https://github.com/kamailio/kamailio/commit/a859ff6e74b0cdc08f30c43adda865a… --- diff --git a/src/modules/xprint/xp_lib.c b/src/modules/xprint/xp_lib.c index 6368d3fc7e..d68bd64c05 100644 --- a/src/modules/xprint/xp_lib.c +++ b/src/modules/xprint/xp_lib.c @@ -814,7 +814,10 @@ static int xl_get_header(struct sip_msg *msg, str *res, str *hp, int hi, int hf) p = local_buf; /* we need to be sure we have parsed all headers */ - parse_headers(msg, HDR_EOH_F, 0); + if(parse_headers(msg, HDR_EOH_F, 0)<0) { + LM_ERR("failed to parse headers\n"); + return xl_get_null(msg, res, hp, hi, hf); + } for (hdrf=msg->headers; hdrf; hdrf=hdrf->next) { if(hp->s==NULL) @@ -1898,9 +1901,10 @@ int xl_mod_init() if (inet_ntop(he->h_addrtype, he->h_addr_list[i], s, HOSTNAME_MAX)) { if (str_ipaddr.len==0) { str_ipaddr.len=strlen(s); - str_ipaddr.s=(char*)pkg_malloc(str_ipaddr.len); + str_ipaddr.s=(char*)pkg_malloc(str_ipaddr.len+1); if (str_ipaddr.s) { memcpy(str_ipaddr.s, s, str_ipaddr.len); + str_ipaddr.s[str_ipaddr.len] = '\0'; } else { str_ipaddr.len=0; LOG(L_ERR, "ERROR: xl_mod_init: No memory left for str_ipaddr\n");

1 0

git:master:ae7dce43: utils: handle error case for xcap auth status to free allocated structs
by Daniel-Constantin Mierla 20 Jul '17

20 Jul '17

Module: kamailio Branch: master Commit: ae7dce434e10ef570e1c6daa8ca5d9f800239ddf URL: https://github.com/kamailio/kamailio/commit/ae7dce434e10ef570e1c6daa8ca5d9f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-20T09:31:49+02:00 utils: handle error case for xcap auth status to free allocated structs --- Modified: src/modules/utils/xcap_auth.c --- Diff: https://github.com/kamailio/kamailio/commit/ae7dce434e10ef570e1c6daa8ca5d9f… Patch: https://github.com/kamailio/kamailio/commit/ae7dce434e10ef570e1c6daa8ca5d9f… --- diff --git a/src/modules/utils/xcap_auth.c b/src/modules/utils/xcap_auth.c index 9455052d98..425fa105cd 100644 --- a/src/modules/utils/xcap_auth.c +++ b/src/modules/utils/xcap_auth.c @@ -465,6 +465,12 @@ int ki_xcap_auth_status(sip_msg_t* _msg, str* watcher_uri, str* presentity_uri) res = get_rules_doc(&uri.user, &uri.host, PRES_RULES, &rules_doc); if ((res < 0) || (rules_doc == NULL) || (rules_doc->s == NULL)) { LM_DBG("no xcap rules doc found for presentity uri\n"); + if(rules_doc) { + if(rules_doc->s) { + pkg_free(rules_doc->s); + } + pkg_free(rules_doc); + } return PENDING_STATUS; }

1 0

git:master:2dc19e5c: tls: free temporary buffer when fixing shm path name for config
by Daniel-Constantin Mierla 20 Jul '17

20 Jul '17

Module: kamailio Branch: master Commit: 2dc19e5c78977416c15ebe93a4f4e6d72ed475a0 URL: https://github.com/kamailio/kamailio/commit/2dc19e5c78977416c15ebe93a4f4e6d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-20T09:31:49+02:00 tls: free temporary buffer when fixing shm path name for config --- Modified: src/modules/tls/tls_domain.c --- Diff: https://github.com/kamailio/kamailio/commit/2dc19e5c78977416c15ebe93a4f4e6d… Patch: https://github.com/kamailio/kamailio/commit/2dc19e5c78977416c15ebe93a4f4e6d… --- diff --git a/src/modules/tls/tls_domain.c b/src/modules/tls/tls_domain.c index e65d01a598..a56c76e2b3 100644 --- a/src/modules/tls/tls_domain.c +++ b/src/modules/tls/tls_domain.c @@ -480,16 +480,25 @@ static int tls_foreach_CTX_in_cfg(tls_domains_cfg_t* cfg, int fix_shm_pathname(str* path) { str new_path; - char* abs_path; - - if (path->s && path->len && *path->s != '.' && *path->s != '/') { + char *abs_path; + + if(path->s && path->len && *path->s != '.' && *path->s != '/') { abs_path = get_abs_pathname(0, path); - if (abs_path == 0) return -1; + if(abs_path == 0) { + LM_ERR("get abs pathname failed\n"); + return -1; + } new_path.len = strlen(abs_path); new_path.s = shm_malloc(new_path.len + 1); + if(new_path.s == 0) { + LM_ERR("no more shm memory\n"); + pkg_free(abs_path); + return -1; + } memcpy(new_path.s, abs_path, new_path.len); new_path.s[new_path.len] = 0; shm_free(path->s); + pkg_free(abs_path); *path = new_path; } return 0;

1 0

git:master:45948fc9: tm: proper location of last rr for strict routing on local requests
by Daniel-Constantin Mierla 20 Jul '17

20 Jul '17

Module: kamailio Branch: master Commit: 45948fc933f99e6a960b835069b7e29d1ea788be URL: https://github.com/kamailio/kamailio/commit/45948fc933f99e6a960b835069b7e29… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-20T09:31:49+02:00 tm: proper location of last rr for strict routing on local requests --- Modified: src/modules/tm/t_fwd.c Modified: src/modules/tm/t_msgbuilder.c --- Diff: https://github.com/kamailio/kamailio/commit/45948fc933f99e6a960b835069b7e29… Patch: https://github.com/kamailio/kamailio/commit/45948fc933f99e6a960b835069b7e29… --- diff --git a/src/modules/tm/t_fwd.c b/src/modules/tm/t_fwd.c index ac55e3a4f8..df9eef4f49 100644 --- a/src/modules/tm/t_fwd.c +++ b/src/modules/tm/t_fwd.c @@ -1190,7 +1190,7 @@ static struct cancel_reason* cancel_reason_pack(short cause, void* data, } else if (cause == CANCEL_REAS_PACKED_HDRS && !(t->flags & T_NO_E2E_CANCEL_REASON) && data) { txt = (str*) data; - reason_len = txt?txt->len:0; + reason_len = txt->len; } else if (unlikely(cause < CANCEL_REAS_MIN)) { LM_CRIT("unhandled reason cause %d\n", cause); goto error; diff --git a/src/modules/tm/t_msgbuilder.c b/src/modules/tm/t_msgbuilder.c index 3d634540e6..3bd76b32fe 100644 --- a/src/modules/tm/t_msgbuilder.c +++ b/src/modules/tm/t_msgbuilder.c @@ -1004,7 +1004,7 @@ static int eval_uac_routing(sip_msg_t *rpl, const struct retr_buf *inv_rb, /* find ptr to last route body that contains the (possibly) old * remote target */ - for (t = rtset, prev_t = t; t->next; prev_t = t, t = t->next) + for (t = rtset, prev_t = NULL; t->next; prev_t = t, t = t->next) ; if ((t->ptr->len == contact->len) && (memcmp(t->ptr->nameaddr.name.s, contact->s, @@ -1022,7 +1022,7 @@ static int eval_uac_routing(sip_msg_t *rpl, const struct retr_buf *inv_rb, if (! (t = pkg_malloc(chklen))) { ERR("out of pkg memory (%d required)\n", (int)chklen); /* last element was freed, unlink it */ - if(prev_t == rtset) { + if(prev_t == NULL) { /* there is only one elem in route set: the remote target */ rtset = NULL; } else { @@ -1036,7 +1036,7 @@ static int eval_uac_routing(sip_msg_t *rpl, const struct retr_buf *inv_rb, ((rr_t *)&t[1])->nameaddr.name = *contact; ((rr_t *)&t[1])->len = contact->len; /* chain the new route elem in set */ - if (prev_t == rtset) + if (prev_t == NULL) /* there is only one elem in route set: the remote target */ rtset = t; else

1 0

git:master:1968b437: core: msg translator - switch condition to buf pointer instead of lenght
by Daniel-Constantin Mierla 20 Jul '17

20 Jul '17

Module: kamailio Branch: master Commit: 1968b43731afdcec1bd40985176680c8af1be921 URL: https://github.com/kamailio/kamailio/commit/1968b43731afdcec1bd40985176680c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-20T09:31:49+02:00 core: msg translator - switch condition to buf pointer instead of lenght - better correlation with returned value from functions --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/1968b43731afdcec1bd40985176680c… Patch: https://github.com/kamailio/kamailio/commit/1968b43731afdcec1bd40985176680c… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 070c6d349d..e58356999d 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2022,7 +2022,7 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, } /* if received needs to be added, add anchor after host and add it, or * overwrite the previous one if already present */ - if (received_len){ + if (received_buf){ if (msg->via1->received){ /* received already present => overwrite it*/ via_insert_param=del_lump(msg, msg->via1->received->start-buf-1, /*;*/ @@ -2039,7 +2039,7 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, received_buf = NULL; } /* if rport needs to be updated, delete it if present and add it's value */ - if (rport_len){ + if (rport_buf){ if (msg->via1->rport){ /* rport already present */ via_insert_param=del_lump(msg, msg->via1->rport->start-buf-1, /*';'*/

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
42
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2017