sr-dev July 2017

sr-dev@lists.kamailio.org

23 participants
411 discussions

git:master:6997738a: sst: add 0 after memcpy
by Daniel-Constantin Mierla 24 Jul '17

24 Jul '17

Module: kamailio Branch: master Commit: 6997738a7098ef56becfd40cb6e7c7864d1975f0 URL: https://github.com/kamailio/kamailio/commit/6997738a7098ef56becfd40cb6e7c78… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-24T08:26:38+02:00 sst: add 0 after memcpy --- Modified: src/modules/sst/sst_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/6997738a7098ef56becfd40cb6e7c78… Patch: https://github.com/kamailio/kamailio/commit/6997738a7098ef56becfd40cb6e7c78… --- diff --git a/src/modules/sst/sst_handlers.c b/src/modules/sst/sst_handlers.c index ba1d4928b0..be55eb8883 100644 --- a/src/modules/sst/sst_handlers.c +++ b/src/modules/sst/sst_handlers.c @@ -791,11 +791,12 @@ static int append_header(struct sip_msg *msg, const char *header) return(1); } len = strlen(header); - if ((s = (char *)pkg_malloc(len)) == 0) { + if ((s = (char *)pkg_malloc(len+1)) == 0) { LM_ERR("No more pkg memory. (size requested = %d)\n", len); return(1); } memcpy(s, header, len); + s[len] = '\0'; if (insert_new_lump_before(anchor, s, len, 0) == 0) { LM_ERR("failed to insert lump\n"); pkg_free(s);

1 0

git:master:823bad5f: uid_uri_db: safer check for accessing to header
by Daniel-Constantin Mierla 24 Jul '17

24 Jul '17

Module: kamailio Branch: master Commit: 823bad5f3aad5c77ff9986ecf4be2517df043788 URL: https://github.com/kamailio/kamailio/commit/823bad5f3aad5c77ff9986ecf4be251… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-24T08:22:24+02:00 uid_uri_db: safer check for accessing to header --- Modified: src/modules/uid_uri_db/uid_uri_db_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/823bad5f3aad5c77ff9986ecf4be251… Patch: https://github.com/kamailio/kamailio/commit/823bad5f3aad5c77ff9986ecf4be251… --- diff --git a/src/modules/uid_uri_db/uid_uri_db_mod.c b/src/modules/uid_uri_db/uid_uri_db_mod.c index 4e5771f493..dba6454b81 100644 --- a/src/modules/uid_uri_db/uid_uri_db_mod.c +++ b/src/modules/uid_uri_db/uid_uri_db_mod.c @@ -238,14 +238,14 @@ static int lookup_uid(struct sip_msg* msg, long id, int store) } else if (id == USE_TO) { get_to_did(&did, msg); if (!msg->to) { - if (parse_headers( msg, HDR_TO_F, 0 )==-1) { + if (parse_headers(msg, HDR_TO_F, 0)==-1 || !msg->to) { ERR("unable to parse To header\n"); return -1; } } to = get_to(msg); if (!to) { - LOG(L_ERR, "uri_db:lookup_uid: Unable to get To username\n"); + LOG(L_ERR, "uri_db:lookup_uid: Unable to get To body\n"); return -1; } if (parse_uri(to->uri.s, to->uri.len, &puri) < 0) {

1 0

git:master:021e49d6: tm: refactored error handling for eval_uac_routing()
by Daniel-Constantin Mierla 24 Jul '17

24 Jul '17

Module: kamailio Branch: master Commit: 021e49d6293cc156cd85791dfc9d59307e62fba0 URL: https://github.com/kamailio/kamailio/commit/021e49d6293cc156cd85791dfc9d593… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-23T10:08:47+02:00 tm: refactored error handling for eval_uac_routing() --- Modified: src/modules/tm/t_msgbuilder.c --- Diff: https://github.com/kamailio/kamailio/commit/021e49d6293cc156cd85791dfc9d593… Patch: https://github.com/kamailio/kamailio/commit/021e49d6293cc156cd85791dfc9d593… --- diff --git a/src/modules/tm/t_msgbuilder.c b/src/modules/tm/t_msgbuilder.c index 3bd76b32fe..c4ab254076 100644 --- a/src/modules/tm/t_msgbuilder.c +++ b/src/modules/tm/t_msgbuilder.c @@ -912,7 +912,6 @@ static int eval_uac_routing(sip_msg_t *rpl, const struct retr_buf *inv_rb, int is_req; struct sip_uri puri; static size_t chklen; - int ret = -1; /* parse the retr. buffer */ memset(&orig_inv, 0, sizeof(struct sip_msg)); @@ -931,14 +930,14 @@ static int eval_uac_routing(sip_msg_t *rpl, const struct retr_buf *inv_rb, /* the bug is at message assembly */ LM_BUG("failed to parse INVITE retr. buffer and/or extract 'To' HF:" "\n%.*s\n", (int)orig_inv.len, orig_inv.buf); - goto end; + goto error; } if (((struct to_body *)orig_inv.to->parsed)->tag_value.len) { LM_DBG("building ACK for in-dialog INVITE (using RS in orig. INV.)\n"); if (parse_headers(&orig_inv, HDR_EOH_F, 0) < 0) { LM_BUG("failed to parse INVITE retr. buffer to EOH:" "\n%.*s\n", (int)orig_inv.len, orig_inv.buf); - goto end; + goto error; } sipmsg = &orig_inv; is_req = 1; @@ -951,7 +950,7 @@ static int eval_uac_routing(sip_msg_t *rpl, const struct retr_buf *inv_rb, /* extract the route set */ if (get_uac_rs(sipmsg, is_req, &rtset) < 0) { LM_ERR("failed to extract route set.\n"); - goto end; + goto error; } if (! rtset) { /* No routes */ @@ -961,7 +960,7 @@ static int eval_uac_routing(sip_msg_t *rpl, const struct retr_buf *inv_rb, if (parse_uri(rtset->ptr->nameaddr.uri.s, rtset->ptr->nameaddr.uri.len, &puri) < 0) { LM_ERR("failed to parse first route in set.\n"); - goto end; + goto error; } if (puri.lr.s) { /* Next hop is loose router */ @@ -993,7 +992,7 @@ static int eval_uac_routing(sip_msg_t *rpl, const struct retr_buf *inv_rb, } else { LM_ERR("failed to establish what kind of router the next " "hop is.\n"); - goto end; + goto error; } break; case F_RB_NH_LOOSE: @@ -1028,8 +1027,7 @@ static int eval_uac_routing(sip_msg_t *rpl, const struct retr_buf *inv_rb, } else { prev_t->next = NULL; } - ret = -1; - goto end; + goto error; } /* this way, .free_rr is also set to 0 (!!!) */ memset(t, 0, chklen); @@ -1054,19 +1052,21 @@ static int eval_uac_routing(sip_msg_t *rpl, const struct retr_buf *inv_rb, #ifdef EXTRA_DEBUG abort(); #else - goto end; + goto error; #endif } } *list = rtset; + free_sip_msg(&orig_inv); /* all went well */ - ret = 0; -end: + return 0; + +error: free_sip_msg(&orig_inv); - if (ret < 0) + if (rtset) free_rte_list(rtset); - return ret; + return -1; } /*

1 0

git:master:9c34b68e: presence_conference: free xml array in case of error
by Daniel-Constantin Mierla 24 Jul '17

24 Jul '17

Module: kamailio Branch: master Commit: 9c34b68ee840880dd6be37694de8e8255f8bfb45 URL: https://github.com/kamailio/kamailio/commit/9c34b68ee840880dd6be37694de8e82… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-23T09:58:16+02:00 presence_conference: free xml array in case of error --- Modified: src/modules/presence_conference/notify_body.c --- Diff: https://github.com/kamailio/kamailio/commit/9c34b68ee840880dd6be37694de8e82… Patch: https://github.com/kamailio/kamailio/commit/9c34b68ee840880dd6be37694de8e82… --- diff --git a/src/modules/presence_conference/notify_body.c b/src/modules/presence_conference/notify_body.c index ff27946fbe..78108dd69e 100644 --- a/src/modules/presence_conference/notify_body.c +++ b/src/modules/presence_conference/notify_body.c @@ -92,7 +92,7 @@ str* agregate_xmls(str* pres_user, str* pres_domain, str** body_array, int n, in xmlNsPtr namespace = NULL; xmlNodePtr p_root= NULL; - xmlDocPtr* xml_array ; + xmlDocPtr* xml_array = NULL ; xmlNodePtr node = NULL; str *body= NULL; char buf[MAX_URI_SIZE+1]; @@ -129,8 +129,7 @@ str* agregate_xmls(str* pres_user, str* pres_domain, str** body_array, int n, in if(j == 0) /* no body */ { - if(xml_array) - pkg_free(xml_array); + pkg_free(xml_array); return NULL; } @@ -142,7 +141,7 @@ str* agregate_xmls(str* pres_user, str* pres_domain, str** body_array, int n, in /* create the new NOTIFY body */ if ( (pres_user->len + pres_domain->len + 1) > MAX_URI_SIZE ) { LM_ERR("entity URI too long, maximum=%d\n", MAX_URI_SIZE); - return NULL; + goto error; } memcpy(buf, pres_user->s, pres_user->len); buf[pres_user->len] = '@';

1 0

git:master:dd0c6fb5: msilo: reorganized tests to free db_res and build of extra headers
by Daniel-Constantin Mierla 24 Jul '17

24 Jul '17

Module: kamailio Branch: master Commit: dd0c6fb586a61cb7e2eed1093ccf8f5158761ae3 URL: https://github.com/kamailio/kamailio/commit/dd0c6fb586a61cb7e2eed1093ccf8f5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-23T09:42:21+02:00 msilo: reorganized tests to free db_res and build of extra headers --- Modified: src/modules/msilo/msfuncs.c Modified: src/modules/msilo/msilo.c --- Diff: https://github.com/kamailio/kamailio/commit/dd0c6fb586a61cb7e2eed1093ccf8f5… Patch: https://github.com/kamailio/kamailio/commit/dd0c6fb586a61cb7e2eed1093ccf8f5… --- diff --git a/src/modules/msilo/msfuncs.c b/src/modules/msilo/msfuncs.c index 43bc82ce60..5262a81159 100644 --- a/src/modules/msilo/msfuncs.c +++ b/src/modules/msilo/msfuncs.c @@ -211,30 +211,30 @@ int m_build_headers(str *buf, str ctype, str contact, time_t date, str extra) if(date > 0) { lenDate = timetToSipDateStr(date,strDate,48); - strncpy(p, strDate, lenDate); + memcpy(p, strDate, lenDate); p += lenDate; } if(ctype.len > 0) { - strncpy(p, "Content-Type: ", 14); + memcpy(p, "Content-Type: ", 14); p += 14; - strncpy(p, ctype.s, ctype.len); + memcpy(p, ctype.s, ctype.len); p += ctype.len; - strncpy(p, CRLF, CRLF_LEN); + memcpy(p, CRLF, CRLF_LEN); p += CRLF_LEN; } if(contact.len > 0 && ms_add_contact) { - strncpy(p, CONTACT_PREFIX, CONTACT_PREFIX_LEN); + memcpy(p, CONTACT_PREFIX, CONTACT_PREFIX_LEN); p += CONTACT_PREFIX_LEN; - strncpy(p, contact.s, contact.len); + memcpy(p, contact.s, contact.len); p += contact.len; - strncpy(p, CONTACT_SUFFIX, CONTACT_SUFFIX_LEN); + memcpy(p, CONTACT_SUFFIX, CONTACT_SUFFIX_LEN); p += CONTACT_SUFFIX_LEN; } if (extra.len > 0) { - strncpy(p, extra.s, extra.len); + memcpy(p, extra.s, extra.len); p += extra.len; } buf->len = p - buf->s; @@ -263,18 +263,18 @@ int m_build_body(str *body, time_t date, str msg, time_t sdate) { if(sdate!=0) { - strncpy(p, "[Reminder message - ", 20); + memcpy(p, "[Reminder message - ", 20); p += 20; - strncpy(p, ctime(&sdate), 24); + memcpy(p, ctime(&sdate), 24); p += 24; *p++ = ']'; } else { - strncpy(p, "[Offline message - ", 19); + memcpy(p, "[Offline message - ", 19); p += 19; - strncpy(p, ctime(&date), 24); + memcpy(p, ctime(&date), 24); p += 24; *p++ = ']'; diff --git a/src/modules/msilo/msilo.c b/src/modules/msilo/msilo.c index d231ae7e6e..f62557ce2a 100644 --- a/src/modules/msilo/msilo.c +++ b/src/modules/msilo/msilo.c @@ -1039,8 +1039,11 @@ static int m_dump(struct sip_msg* msg, str* owner_s) } if (msilo_dbf.query(db_con,db_keys,db_ops,db_vals,db_cols,db_no_keys, - db_no_cols, ob_key, &db_res) < 0) { + db_no_cols, ob_key, &db_res) < 0 || db_res==NULL) { LM_ERR("failed to query database\n"); + if (db_res!=NULL && msilo_dbf.free_result(db_con, db_res) < 0) { + LM_ERR("failed to free the query result\n"); + } goto error; } @@ -1071,13 +1074,13 @@ static int m_dump(struct sip_msg* msg, str* owner_s) (time_t)RES_ROWS(db_res)[i].values[5/*inc time*/].val.int_val; if (ms_extra_hdrs != NULL) { - if (fixup_get_svalue(msg, (gparam_p)*ms_extra_hdrs_sp, - &extra_hdrs_str) != 0) { - if (msilo_dbf.free_result(db_con, db_res) < 0) - LM_ERR("failed to free the query result\n"); - LM_ERR("unable to get extra_hdrs value\n"); - goto error; - } + if(fixup_get_svalue(msg, (gparam_p)*ms_extra_hdrs_sp, + &extra_hdrs_str) != 0) { + if(msilo_dbf.free_result(db_con, db_res) < 0) + LM_ERR("failed to free the query result\n"); + LM_ERR("unable to get extra_hdrs value\n"); + goto error; + } } else { extra_hdrs_str.len = 0; } @@ -1153,7 +1156,7 @@ static int m_dump(struct sip_msg* msg, str* owner_s) * Free the result because we don't need it * anymore */ - if ((db_res !=NULL) && msilo_dbf.free_result(db_con, db_res) < 0) + if (msilo_dbf.free_result(db_con, db_res) < 0) LM_ERR("failed to free result of query\n"); return 1;

1 0

git:master:65ac6de1: mediaproxy: handle return pointer values
by Daniel-Constantin Mierla 23 Jul '17

23 Jul '17

Module: kamailio Branch: master Commit: 65ac6de1aebd6143c44f35ef28f46c2cd3a56723 URL: https://github.com/kamailio/kamailio/commit/65ac6de1aebd6143c44f35ef28f46c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-23T09:01:07+02:00 mediaproxy: handle return pointer values --- Modified: src/modules/mediaproxy/mediaproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/65ac6de1aebd6143c44f35ef28f46c2… Patch: https://github.com/kamailio/kamailio/commit/65ac6de1aebd6143c44f35ef28f46c2… --- diff --git a/src/modules/mediaproxy/mediaproxy.c b/src/modules/mediaproxy/mediaproxy.c index 71c365e07c..f1fa9613b0 100644 --- a/src/modules/mediaproxy/mediaproxy.c +++ b/src/modules/mediaproxy/mediaproxy.c @@ -809,12 +809,14 @@ static str get_sdp_line_separator(str *sdp) { char *ptr, *end_ptr, *sdp_end; - str separator; + str separator = STR_NULL; sdp_end = sdp->s + sdp->len; ptr = find_line_starting_with(sdp, "v=", False); + if(ptr==NULL) { return separator; } end_ptr = findendline(ptr, sdp_end-ptr); + if(end_ptr==NULL) { return separator; } separator.s = ptr = end_ptr; while ((*ptr=='\n' || *ptr=='\r') && ptr<sdp_end) ptr++; @@ -1329,7 +1331,7 @@ insert_element(struct sip_msg *msg, char *position, char *element) len = strlen(element); - buf = pkg_malloc(len); + buf = pkg_malloc(len+1); if (!buf) { LM_ERR("out of memory\n"); return False; @@ -1343,6 +1345,7 @@ insert_element(struct sip_msg *msg, char *position, char *element) } memcpy(buf, element, len); + buf[len] = '\0'; if (insert_new_lump_after(anchor, buf, len, 0)==0) { LM_ERR("failed to insert new element\n");

1 0

git:master:0efa76d8: json: remove use of deprecated macro is_error()
by Daniel-Constantin Mierla 23 Jul '17

23 Jul '17

Module: kamailio Branch: master Commit: 0efa76d80e159fd2a7516388fe2405ad4fb6c5b6 URL: https://github.com/kamailio/kamailio/commit/0efa76d80e159fd2a7516388fe2405a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-23T08:59:43+02:00 json: remove use of deprecated macro is_error() --- Modified: src/modules/json/json_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/0efa76d80e159fd2a7516388fe2405a… Patch: https://github.com/kamailio/kamailio/commit/0efa76d80e159fd2a7516388fe2405a… --- diff --git a/src/modules/json/json_funcs.c b/src/modules/json/json_funcs.c index 935877f651..2de892154b 100644 --- a/src/modules/json/json_funcs.c +++ b/src/modules/json/json_funcs.c @@ -56,9 +56,8 @@ int json_get_field(struct sip_msg* msg, char* json, char* field, char* dst) j = json_tokener_parse(json_s.s); - if (is_error(j)) { + if (j==NULL) { LM_ERR("empty or invalid JSON\n"); - if(j!=NULL) json_object_put(j); return -1; } @@ -74,6 +73,6 @@ int json_get_field(struct sip_msg* msg, char* json, char* field, char* dst) ret = -1; } - if(j!=NULL) json_object_put(j); + json_object_put(j); return ret; }

1 0

[kamailio/kamailio] tls mod cannot be loaded on Alpine Linux (#1188)
by sergey-safarov 22 Jul '17

22 Jul '17

### Description I want use kamailio on Alpine linux dist. All looks fine except tls module. During config file checking i got errors ``` / # / # vi /etc/kamailio/kamailio.cfg / # kamailio -c -f /etc/kamailio/kamailio.cfg loading modules under config path: /usr/lib/kamailio/modules/ 0(15) ERROR: <core> [core/sr_module.c:570]: load_module(): could not find module <mi_fifo> in </usr/lib/kamailio/modules/> 0(15) CRITICAL: <core> [core/cfg.y:3400]: yyerror_at(): parse error in config file /etc/kamailio/kamailio.cfg, line 218, column 12-23: failed to load module 0(15) ERROR: <core> [core/sr_module.c:570]: load_module(): could not find module <mi_rpc> in </usr/lib/kamailio/modules/> 0(15) CRITICAL: <core> [core/cfg.y:3400]: yyerror_at(): parse error in config file /etc/kamailio/kamailio.cfg, line 234, column 12-22: failed to load module 0(15) ERROR: <core> [core/sr_module.c:582]: load_module(): could not open module </usr/lib/kamailio/modules/tls.so>: Error relocating /usr/lib/kamailio/modules/tls.so: EC_KEY_new_by_curve_name: symbol not found 0(15) CRITICAL: <core> [core/cfg.y:3400]: yyerror_at(): parse error in config file /etc/kamailio/kamailio.cfg, line 265, column 12-19: failed to load module 0(15) ERROR: <core> [core/modparam.c:152]: set_mod_param_regex(): No module matching <mi_fifo> found 0(15) CRITICAL: <core> [core/cfg.y:3403]: yyerror_at(): parse error in config file /etc/kamailio/kamailio.cfg, line 285, column 67: Can't set module parameter 0(15) ERROR: <core> [core/modparam.c:152]: set_mod_param_regex(): No module matching <tls> found 0(15) CRITICAL: <core> [core/cfg.y:3403]: yyerror_at(): parse error in config file /etc/kamailio/kamailio.cfg, line 411, column 50: Can't set module parameter ERROR: bad config file (5 errors) 0(15) INFO: <core> [core/sctp_core.c:53]: sctp_core_destroy(): SCTP API not initialized / # / # ``` Error load_module(): could not open module </usr/lib/kamailio/modules/tls.so>: Error relocating /usr/lib/kamailio/modules/tls.so: EC_KEY_new_by_curve_name: symbol not found #### Reproduction docker run -it alpine sh apk --no-cache add alpine-sdk linux-headers bison flex libressl-dev cd kamailio sed -i -e 's/0x10100000L/0x10100000L || defined(LIBRESSL_VERSION_NUMBER)/' src/modules/tls/tls_locking.c make include_modules="tls" cfg make all make install sed -i '1s/^/#!define WITH_TLS\n/' /usr/local/etc/kamailio/kamailio.cfg /usr/local/sbin/kamailio -c -f /usr/local/etc/kamailio/kamailio.cfg #### Log Messages ``` @8bdc47c389e6:/usr/local/etc/kamailio$ /usr/local/sbin/kamailio -c -f /usr/local/etc/kamailio/kamailio.cfg 0(22421) ERROR: <core> [core/sr_module.c:582]: load_module(): could not open module </usr/local/lib64/kamailio/modules/tls.so>: Error relocating /usr/local/lib64/kamailio/modules/tls.so: SSL_CTX_set_min_proto_version: symbol not found 0(22421) CRITICAL: <core> [core/cfg.y:3426]: yyerror_at(): parse error in config file /usr/local/etc/kamailio/kamailio.cfg, line 276, column 12-19: failed to load module 0(22421) ERROR: <core> [core/modparam.c:152]: set_mod_param_regex(): No module matching <tls> found 0(22421) CRITICAL: <core> [core/cfg.y:3429]: yyerror_at(): parse error in config file /usr/local/etc/kamailio/kamailio.cfg, line 426, column 60: Can't set module parameter ERROR: bad config file (2 errors) 0(22421) INFO: <core> [core/sctp_core.c:53]: sctp_core_destroy(): SCTP API not initialized ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` @8bdc47c389e6:/usr/local/etc/kamailio$ /usr/local/sbin/kamailio -v version: kamailio 5.1.0-dev5 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 20:55:58 Jul 21 2017 with gcc 6.2.1 @8bdc47c389e6:/usr/local/etc/kamailio$ ``` * **Operating System**: Alpine linux 3.6 ``` @8bdc47c389e6:/usr/local/etc/kamailio$ uname -a Linux 8bdc47c389e6 3.10.0-514.16.1.el7.x86_64 #1 SMP Wed Apr 12 15:04:24 UTC 2017 x86_64 Linux``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1188

2 2

git:master:5f9eba3e: memcached: handle error cases and alloc enough for null termination
by Daniel-Constantin Mierla 22 Jul '17

22 Jul '17

Module: kamailio Branch: master Commit: 5f9eba3eb42cdb8a5c2ec840cec29757d480e136 URL: https://github.com/kamailio/kamailio/commit/5f9eba3eb42cdb8a5c2ec840cec2975… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-22T08:35:01+02:00 memcached: handle error cases and alloc enough for null termination --- Modified: src/modules/memcached/mcd_var.c Modified: src/modules/memcached/memcached.c --- Diff: https://github.com/kamailio/kamailio/commit/5f9eba3eb42cdb8a5c2ec840cec2975… Patch: https://github.com/kamailio/kamailio/commit/5f9eba3eb42cdb8a5c2ec840cec2975… --- diff --git a/src/modules/memcached/mcd_var.c b/src/modules/memcached/mcd_var.c index a55f57ba19..442cf219e3 100644 --- a/src/modules/memcached/mcd_var.c +++ b/src/modules/memcached/mcd_var.c @@ -442,6 +442,7 @@ int pv_parse_mcd_name(pv_spec_p sp, str *in) { if(pv_parse_format(in, &tmp) || tmp==NULL) { LM_ERR("wrong format [%.*s]\n", in->len, in->s); + if(tmp) pkg_free(tmp); return -1; } diff --git a/src/modules/memcached/memcached.c b/src/modules/memcached/memcached.c index be50316ceb..b85d8191ee 100644 --- a/src/modules/memcached/memcached.c +++ b/src/modules/memcached/memcached.c @@ -233,6 +233,7 @@ static int mod_init(void) { char *server, *port; unsigned int len = 0; memcached_return rc; + struct memcached_server_st *svt; if ((port = strchr(mcd_srv_str, ':')) != NULL) { port = port + 1; @@ -243,7 +244,7 @@ static int mod_init(void) { len = strlen(mcd_srv_str) ; } - server = pkg_malloc(len); + server = pkg_malloc(len+1); if (server == NULL) { PKG_MEM_ERROR; return -1; @@ -255,6 +256,7 @@ static int mod_init(void) { memcached_h = memcached_create(NULL); if (memcached_h == NULL) { LM_ERR("could not create memcached structure\n"); + pkg_free(server); return -1; } LM_DBG("allocated new server handle at %p", memcached_h); @@ -276,16 +278,28 @@ static int mod_init(void) { LM_DBG("memory manager callbacks set\n"); } else { LM_ERR("memory manager callbacks not set, returned %s.\n", memcached_strerror(memcached_h, rc)); + pkg_free(server); return -1; } } else { LM_INFO("Use system memory manager for memcached client library\n"); } - servers = memcached_server_list_append(servers, server, atoi(port), &rc); + svt = memcached_server_list_append(servers, server, atoi(port), &rc); + if(svt==NULL) { + LM_ERR("failed to append server\n"); + if(servers) { + memcached_server_list_free(servers); + servers = NULL; + } + pkg_free(server); + return -1; + } + servers = svt; if (memcached_behavior_set(memcached_h, MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT, mcd_timeout) != MEMCACHED_SUCCESS) { LM_ERR("could not set server connection timeout\n"); + pkg_free(server); return -1; } rc = memcached_server_push(memcached_h, servers); @@ -293,6 +307,7 @@ static int mod_init(void) { LM_DBG("added server list to structure\n"); } else { LM_ERR("attempt to add server list to structure returned %s.\n", memcached_strerror(memcached_h, rc)); + pkg_free(server); return -1; }

1 0

git:master:449d4351: nat_traversal: handle return values for errors
by Daniel-Constantin Mierla 22 Jul '17

22 Jul '17

Module: kamailio Branch: master Commit: 449d435194338a4f3acf079774adcbef7ad7b794 URL: https://github.com/kamailio/kamailio/commit/449d435194338a4f3acf079774adcbe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-22T08:34:01+02:00 nat_traversal: handle return values for errors --- Modified: src/modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/449d435194338a4f3acf079774adcbe… Patch: https://github.com/kamailio/kamailio/commit/449d435194338a4f3acf079774adcbe… --- diff --git a/src/modules/nat_traversal/nat_traversal.c b/src/modules/nat_traversal/nat_traversal.c index 8bd4adde65..d3c6c95057 100644 --- a/src/modules/nat_traversal/nat_traversal.c +++ b/src/modules/nat_traversal/nat_traversal.c @@ -1573,6 +1573,10 @@ send_keepalive(NAT_Contact *contact) lport = 0; lproto = PROTO_NONE; hostent = sip_resolvehost(&nat_ip, &lport, &lproto); + if(hostent==NULL) { + LM_ERR("sip resolve host failed\n"); + return; + } hostent2su(&dst.to, hostent, 0, nat_port); dst.proto=PROTO_UDP; dst.send_sock=contact->socket; @@ -1900,7 +1904,9 @@ reply_filter(struct sip_msg *reply) static str prefix = {NULL, 0}; str call_id; - parse_headers(reply, HDR_VIA2_F, 0); + if(parse_headers(reply, HDR_VIA2_F, 0)<0) { + LM_DBG("second via not parsed\n"); + } if (reply->via2) return 1;

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
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