sr-dev December 2018

sr-dev@lists.kamailio.org

23 participants
313 discussions

git:master:970fc2ac: core: remove the SHM_MEM #define, the core will not even compile without it

by Henning Westerholt

Module: kamailio Branch: master Commit: 970fc2ac73fb38b22d5a5acd3e326fb97b97f6af URL: https://github.com/kamailio/kamailio/commit/970fc2ac73fb38b22d5a5acd3e326fb… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-26T20:22:51+01:00 core: remove the SHM_MEM #define, the core will not even compile without it - remove the SHM_MEM #define, the purpose of this was to allow the compilation without SHM memory pool support - this did not worked for a long time, the core will not even compile without it (no locking, broken timer etc..). Additionally many modules need it. - remove 50 ifdef/endif blocks, no functional changes done --- Modified: src/core/cfg.y Modified: src/core/cfg_core.c Modified: src/core/cfg_core.h Modified: src/core/lock_alloc.h Modified: src/core/mem/mem.c Modified: src/core/mem/shm_mem.c Modified: src/core/mem/shm_mem.h Modified: src/core/pt.c Modified: src/core/pt.h Modified: src/core/shm_init.c Modified: src/core/timer.c Modified: src/core/ut.h Modified: src/core/ver_defs.h --- Diff: https://github.com/kamailio/kamailio/commit/970fc2ac73fb38b22d5a5acd3e326fb… Patch: https://github.com/kamailio/kamailio/commit/970fc2ac73fb38b22d5a5acd3e326fb…

5 years, 11 months

[kamailio/kamailio] unquoted value in global vars got segafult or error at cfg files (#1779)

by PICCORO Lenz McKAY

### Description due the behaviour of the variable "alias" the other that use dots inside are misinterpreted: seems ambiguity in the grammar with alias and listen respect other vars that have "dots" in values. Both alias and listen can have an unquoted host list as value. An unquoted host is a list of IDs separated by ‘.’. Since EOL is not taken into account, then `alias=foo.bar` followed by `myvar.msg=2.3.4.5` is interpreted as: `alias=foo.bar myvar.msg` bug of course in issue #1773 nobody check that right? ### Troubleshooting kamailio seems does not reconoce it the global variable in kamailio.cfg file **if no double quoted the value itselft! but if are not global variables, alias variable can be unquoted!** prevousli done in isues: * #1773 closed by a comment that does not make sense due i configured in right way * after furter investigation seems due the alias variable that implies a "dot" inside the value seems the "dots" are misinterperted due the presence of the aliases variable that already are present! and that generated a very very older problem! #### Reproduction download, configure and make build of kamailio use the main config file in that file put only one change, presicelly and adition: `kamailio.bindip=10.101.10.10` **bur using doble coutes seems there no problem** this are not documented and seems its and ancient bug #### Log Messages ``` 0(1542) DEBUG: <core> [core/modparam.c:83]: set_mod_param_regex(): 'debugger' matches module 'debugger' 0(1542) DEBUG: <core> [core/sr_module.c:811]: find_param_export(): found <log_level_name> in module debugger [/usr/lib/x86_64-linux-gnu/kamailio/modules/debugger.so] 0(1542) DEBUG: <core> [core/modparam.c:99]: set_mod_param_regex(): found <log_level_name> in module debugger [/usr/lib/x86_64-linux-gnu/kamailio/modules/debugger.so] 0(1542) CRITICAL: <core> [core/cfg.y:3450]: yyerror_at(): parse error in config file kamailio.cfg, line 9, column 6: syntax error 0(1542) CRITICAL: <core> [core/cfg.y:3450]: yyerror_at(): parse error in config file kamailio.cfg, line 9, column 6: unknown config variable 0(1542) CRITICAL: <core> [core/cfg.y:3447]: yyerror_at(): parse error in config file kamailio.cfg, line 9, column 7-8: ERROR: bad config file (3 errors) 0(1542) WARNING: <core> [core/ppcfg.c:221]: pp_ifdef_level_check(): different number of preprocessor directives: N(#!IF[N]DEF) - N(#!ENDIF) = 1 ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.1.6 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, 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_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 4.9.2 ``` * **Operating System**: ``` Linux ip-10-101-2-78 3.16.0-4-amd64 #1 SMP Debian 3.16.39-1 (2016-12-30) x86_64 GNU/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/1779

5 years, 11 months

[kamailio/kamailio] table check error when upgrade kamailio 4 to 5 (#1780)

by PICCORO Lenz McKAY

### Description i upgrade kamailio 4 to 5 following all the respective guides carefully: https://www.kamailio.org/wiki/install/upgrade/4.4.x-to-5.0.0 and then from 5.0 to 5.1 and kamailio does not start ### Troubleshooting kamailio does not run and got error: `db_check_table_version(): invalid version 6 for table sipusers found, expected 7 (check table structure and table "version")` the message are very ambigous #### Reproduction * install log time ago kamailio 4.4 * apply all steps to upgrade as https://www.kamailio.org/wiki/install/upgrade/4.4.x-to-5.0.0 * apply again aditional steps as https://www.kamailio.org/wiki/install/upgrade/5.0.x-to-5.1.0 * restar kamailio and does not start due error on table check #### Log Messages ``` Dec 21 16:34:31 ip-10-101-2-78 kamailio[8501]: 0(8503) DEBUG: db_mysql [km_my_con.c:148]: db_mysql_new_connection(): server version is 5.5.5-10.0.32-MariaDB-0+deb8u1 Dec 21 16:34:31 ip-10-101-2-78 kamailio[8501]: 0(8503) DEBUG: <core> [db_res.c:120]: db_new_result(): allocate 56 bytes for result set at 0x7f395b036b30 Dec 21 16:34:31 ip-10-101-2-78 kamailio[8501]: 0(8503) DEBUG: db_mysql [km_res.c:66]: db_mysql_get_columns(): 1 columns returned from the query Dec 21 16:34:31 ip-10-101-2-78 kamailio[8501]: 0(8503) DEBUG: <core> [db_res.c:158]: db_allocate_columns(): allocate 8 bytes for result names at 0x7f395b044128 Dec 21 16:34:31 ip-10-101-2-78 kamailio[8501]: 0(8503) DEBUG: <core> [db_res.c:169]: db_allocate_columns(): allocate 4 bytes for result types at 0x7f395b044198 Dec 21 16:34:31 ip-10-101-2-78 kamailio[8501]: 0(8503) DEBUG: db_mysql [km_res.c:84]: db_mysql_get_columns(): allocate 16 bytes for RES_NAMES[0] at 0x7f395b0b91c8 Dec 21 16:34:31 ip-10-101-2-78 kamailio[8501]: 0(8503) DEBUG: db_mysql [km_res.c:91]: db_mysql_get_columns(): RES_NAMES(0x7f395b0b91c8)[0]=[table_version] Dec 21 16:34:31 ip-10-101-2-78 kamailio[8501]: 0(8503) DEBUG: db_mysql [km_res.c:99]: db_mysql_get_columns(): use DB1_INT result type Dec 21 16:34:31 ip-10-101-2-78 kamailio[8501]: 0(8503) DEBUG: <core> [db_res.c:188]: db_allocate_rows(): allocate 16 bytes for rows at 0x7f395b0b9240 Dec 21 16:34:31 ip-10-101-2-78 kamailio[8501]: 0(8503) DEBUG: <core> [db_row.c:117]: db_allocate_row(): allocate 32 bytes for row values at 0x7f395b0b92b8 Dec 21 16:34:31 ip-10-101-2-78 kamailio[8501]: 0(8503) DEBUG: <core> [db_val.c:74]: db_str2val(): converting INT [6] Dec 21 16:34:31 ip-10-101-2-78 kamailio[8501]: 0(8503) DEBUG: <core> [db_res.c:79]: db_free_columns(): freeing 1 columns Dec 21 16:34:31 ip-10-101-2-78 kamailio[8501]: 0(8503) DEBUG: <core> [db_res.c:83]: db_free_columns(): freeing RES_NAMES[0] at 0x7f395b0b91c8 Dec 21 16:34:31 ip-10-101-2-78 kamailio[8501]: 0(8503) DEBUG: <core> [db_res.c:96]: db_free_columns(): freeing result names at 0x7f395b044128 Dec 21 16:34:31 ip-10-101-2-78 kamailio[8501]: 0(8503) DEBUG: <core> [db_res.c:101]: db_free_columns(): freeing result types at 0x7f395b044198 Dec 21 16:34:31 ip-10-101-2-78 kamailio[8501]: 0(8503) DEBUG: <core> [db_res.c:52]: db_free_rows(): freeing 1 rows Dec 21 16:34:31 ip-10-101-2-78 kamailio[8501]: 0(8503) DEBUG: <core> [db_row.c:95]: db_free_row(): freeing row values at 0x7f395b0b92b8 Dec 21 16:34:31 ip-10-101-2-78 kamailio[8501]: 0(8503) DEBUG: <core> [db_res.c:60]: db_free_rows(): freeing rows at 0x7f395b0b9240 Dec 21 16:34:31 ip-10-101-2-78 kamailio[8501]: 0(8503) DEBUG: <core> [db_res.c:138]: db_free_result(): freeing result set at 0x7f395b036b30 Dec 21 16:34:31 ip-10-101-2-78 kamailio[8501]: 0(8503) ERROR: <core> [db.c:450]: db_check_table_version(): invalid version 6 for table sipusers found, expected 7 (check table structure and table "version") Dec 21 16:34:31 ip-10-101-2-78 kamailio[8501]: 0(8503) ERROR: auth_db [auth_db_mod.c:308]: auth_fixup(): error during table version check. Dec 21 16:34:31 ip-10-101-2-78 kamailio[8501]: 0(8503) DEBUG: <core> [db_pool.c:100]: pool_remove(): removing connection from the pool ``` ### Possible Solutions could the changelog provide the missing tables? or wiki doesn ot point all the respective changes? ### Additional Information ``` version: kamailio 5.1.6 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, 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_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 4.9.2 ``` ### Operating System: ``` Linux ip-10-101-2-78 3.16.0-4-amd64 #1 SMP Debian 3.16.39-1 (2016-12-30) x86_64 GNU/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/1780

5 years, 11 months

git:master:d272dafb: lib: lib: refactor ims library to use common pkg and shm memory helper logging #define

by Henning Westerholt

Module: kamailio Branch: master Commit: d272dafbfa2e57a6a0ee444890a83afe0984ca6b URL: https://github.com/kamailio/kamailio/commit/d272dafbfa2e57a6a0ee444890a83af… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-26T14:47:39+01:00 lib: lib: refactor ims library to use common pkg and shm memory helper logging #define --- Modified: src/lib/ims/ims_getters.c --- Diff: https://github.com/kamailio/kamailio/commit/d272dafbfa2e57a6a0ee444890a83af… Patch: https://github.com/kamailio/kamailio/commit/d272dafbfa2e57a6a0ee444890a83af… --- diff --git a/src/lib/ims/ims_getters.c b/src/lib/ims/ims_getters.c index 0929bdf4e6..26fdbb8c41 100644 --- a/src/lib/ims/ims_getters.c +++ b/src/lib/ims/ims_getters.c @@ -301,6 +301,10 @@ str cscf_get_public_identity(struct sip_msg *msg) if(get_to(msg) == NULL) { to = (struct to_body *)pkg_malloc(sizeof(struct to_body)); + if (to == NULL) { + PKG_MEM_ERROR; + return pu; + } parse_to(msg->to->body.s, msg->to->body.s + msg->to->body.len, to); msg->to->parsed = to; } else @@ -334,6 +338,10 @@ str cscf_get_public_identity_from(struct sip_msg *msg) if(get_from(msg) == NULL) { from = (struct to_body *)pkg_malloc(sizeof(struct to_body)); + if (from == NULL) { + PKG_MEM_ERROR; + return pu; + } parse_to(msg->from->body.s, msg->from->body.s + msg->from->body.len, from); msg->from->parsed = from; @@ -454,9 +462,7 @@ str cscf_get_public_identity_from_requri(struct sip_msg *msg) pu.len = 4 + msg->parsed_uri.user.len; pu.s = shm_malloc(pu.len + 1); if(!pu.s) { - LM_ERR("cscf_get_public_identity_from_requri: Error allocating %d " - "bytes\n", - pu.len + 1); + SHM_MEM_ERROR; pu.len = 0; goto done; } @@ -466,9 +472,7 @@ str cscf_get_public_identity_from_requri(struct sip_msg *msg) pu.len = 4 + msg->parsed_uri.user.len + 1 + msg->parsed_uri.host.len; pu.s = shm_malloc(pu.len + 1); if(!pu.s) { - LM_ERR("cscf_get_public_identity_from_requri: Error allocating %d " - "bytes\n", - pu.len + 1); + SHM_MEM_ERROR; pu.len = 0; goto done; } @@ -508,9 +512,7 @@ str cscf_get_contact_from_requri(struct sip_msg *msg) + 1 /*for colon before port*/; pu.s = shm_malloc(pu.len + 1); if(!pu.s) { - LM_ERR("cscf_get_public_identity_from_requri: Error allocating %d " - "bytes\n", - pu.len + 1); + SHM_MEM_ERROR; pu.len = 0; goto done; } @@ -523,9 +525,7 @@ str cscf_get_contact_from_requri(struct sip_msg *msg) + msg->parsed_uri.port.len + 1 /*for colon before port*/; pu.s = shm_malloc(pu.len + 1); if(!pu.s) { - LM_ERR("cscf_get_public_identity_from_requri: Error allocating %d " - "bytes\n", - pu.len + 1); + SHM_MEM_ERROR; pu.len = 0; goto done; } @@ -642,7 +642,7 @@ str cscf_get_asserted_identity(struct sip_msg *msg, int is_shm) { len = pai->uri.len + 1; uri.s = (char*) pkg_malloc(pai->uri.len + 1); if (!uri.s) { - LM_ERR("no more pkg mem\n"); + PKG_MEM_ERROR; return uri; } memset(uri.s, 0, len); @@ -986,7 +986,7 @@ struct via_body* cscf_get_last_via(struct sip_msg *msg) if (!h->parsed){ vb = pkg_malloc(sizeof(struct via_body)); if (!vb){ - LM_ERR("cscf_get_last_via: Error allocating %lx bytes\n",sizeof(struct via_body)); + PKG_MEM_ERROR; return 0; } parse_via(h->body.s,h->body.s+h->body.len,vb); @@ -1315,7 +1315,7 @@ int cscf_get_p_charging_vector(struct sip_msg *msg, str * icid, str * orig_ioi, str_free(header_body, pkg); return 1; out_of_memory: - LM_ERR("cscf_get_p_charging_vector:out of pkg memory\n"); + PKG_MEM_ERROR; return 0; } @@ -1466,7 +1466,7 @@ int cscf_get_p_associated_uri(struct sip_msg *msg, str **public_id, } *public_id = pkg_malloc(sizeof(str)*(*public_id_cnt)); if (*public_id==NULL) { - LM_ERR("Error out of pkg memory"); + PKG_MEM_ERROR; return 0; } r2 = r; @@ -1718,7 +1718,7 @@ int cscf_get_cseq(struct sip_msg *msg,struct hdr_field **hr) if (!h->parsed){ cseq = pkg_malloc(sizeof(struct cseq_body)); if (!cseq){ - LM_ERR("ERR:cscf_get_cseq: Header CSeq not found\n"); + PKG_MEM_ERROR; return 0; } parse_cseq(h->body.s,h->body.s+h->body.len,cseq);

5 years, 11 months

git:master:3b0c06ef: lib: refactor srdb1 DB1 API to use common pkg memory helper logging #define

by Henning Westerholt

Module: kamailio Branch: master Commit: 3b0c06ef76f3bb651395951d90ad83d11eb8db65 URL: https://github.com/kamailio/kamailio/commit/3b0c06ef76f3bb651395951d90ad83d… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-26T14:26:41+01:00 lib: refactor srdb1 DB1 API to use common pkg memory helper logging #define --- Modified: src/lib/srdb1/db.c Modified: src/lib/srdb1/db_id.c Modified: src/lib/srdb1/db_query.c Modified: src/lib/srdb1/db_res.c Modified: src/lib/srdb1/db_row.c Modified: src/lib/srdb1/db_val.c --- Diff: https://github.com/kamailio/kamailio/commit/3b0c06ef76f3bb651395951d90ad83d… Patch: https://github.com/kamailio/kamailio/commit/3b0c06ef76f3bb651395951d90ad83d…

5 years, 11 months

git:master:99250f75: rtpengine: lock only when db backend is enabled for build_rtpp_socks()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 99250f758e6deb90a5852599f831a53ab394b751 URL: https://github.com/kamailio/kamailio/commit/99250f758e6deb90a5852599f831a53… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-26T11:50:50+01:00 rtpengine: lock only when db backend is enabled for build_rtpp_socks() --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/99250f758e6deb90a5852599f831a53… Patch: https://github.com/kamailio/kamailio/commit/99250f758e6deb90a5852599f831a53… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 6f91e607bd..f18a35b33d 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -1633,6 +1633,14 @@ mod_init(void) return 0; } +#define rtpe_reload_lock_get(plock) do { \ + if (rtpp_db_url.s != NULL) lock_get(plock); \ +} while(0) + +#define rtpe_reload_lock_release(plock) do { \ + if (rtpp_db_url.s != NULL) lock_release(plock); \ +} while(0) + static int build_rtpp_socks() { int n, i; char *cp; @@ -1644,9 +1652,9 @@ static int build_rtpp_socks() { int ip_mtu_discover = IP_PMTUDISC_DONT; #endif - lock_get(rtpp_no_lock); + rtpe_reload_lock_get(rtpp_no_lock); current_rtpp_no = *rtpp_no; - lock_release(rtpp_no_lock); + rtpe_reload_lock_release(rtpp_no_lock); if (current_rtpp_no == rtpp_socks_size) return 0; @@ -1667,11 +1675,11 @@ static int build_rtpp_socks() { } memset(rtpp_socks, -1, sizeof(int)*(rtpp_socks_size)); - lock_get(rtpp_set_list->rset_head_lock); + rtpe_reload_lock_get(rtpp_set_list->rset_head_lock); for (rtpp_list = rtpp_set_list->rset_first; rtpp_list != 0; rtpp_list = rtpp_list->rset_next) { - lock_get(rtpp_list->rset_lock); + rtpe_reload_lock_get(rtpp_list->rset_lock); for (pnode=rtpp_list->rn_first; pnode!=0; pnode = pnode->rn_next) { char *hostname; @@ -1762,9 +1770,9 @@ static int build_rtpp_socks() { rptest: pnode->rn_disabled = rtpp_test(pnode, 0, 1); } - lock_release(rtpp_list->rset_lock); + rtpe_reload_lock_release(rtpp_list->rset_lock); } - lock_release(rtpp_set_list->rset_head_lock); + rtpe_reload_lock_release(rtpp_set_list->rset_head_lock); return 0; }

5 years, 11 months

git:master:7873a653: cdp: init pointer to avoid warning on uninitialized use

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7873a653a43070f891dc6cde5c188c81bf5de25d URL: https://github.com/kamailio/kamailio/commit/7873a653a43070f891dc6cde5c188c8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-26T09:59:44+01:00 cdp: init pointer to avoid warning on uninitialized use --- Modified: src/modules/cdp/diameter_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/7873a653a43070f891dc6cde5c188c8… Patch: https://github.com/kamailio/kamailio/commit/7873a653a43070f891dc6cde5c188c8… --- diff --git a/src/modules/cdp/diameter_msg.c b/src/modules/cdp/diameter_msg.c index fb4257f52a..464a3504e1 100644 --- a/src/modules/cdp/diameter_msg.c +++ b/src/modules/cdp/diameter_msg.c @@ -459,7 +459,7 @@ AAAMessage* AAATranslateMessage( unsigned char* source, unsigned int sourceLen, int attach_buf) { unsigned char *ptr; - AAAMessage *msg; + AAAMessage *msg = 0; unsigned char version; unsigned int msg_len; AAA_AVP *avp;

5 years, 11 months

git:master:3ca9765e: db_redis: use safe clist iteration for db_redis_free_tables()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3ca9765eea980283963a48a9767e93566063057f URL: https://github.com/kamailio/kamailio/commit/3ca9765eea980283963a48a9767e935… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-26T09:59:44+01:00 db_redis: use safe clist iteration for db_redis_free_tables() --- Modified: src/modules/db_redis/redis_table.c --- Diff: https://github.com/kamailio/kamailio/commit/3ca9765eea980283963a48a9767e935… Patch: https://github.com/kamailio/kamailio/commit/3ca9765eea980283963a48a9767e935… --- diff --git a/src/modules/db_redis/redis_table.c b/src/modules/db_redis/redis_table.c index e9db44458e..fe63490174 100644 --- a/src/modules/db_redis/redis_table.c +++ b/src/modules/db_redis/redis_table.c @@ -294,7 +294,9 @@ void db_redis_free_tables(km_redis_con_t *con) { struct str_hash_table *ht; struct str_hash_table *col_ht; struct str_hash_entry *he; + struct str_hash_entry *he_b; struct str_hash_entry *col_he; + struct str_hash_entry *col_he_b; struct str_hash_entry *last; struct str_hash_entry *col_last; redis_table_t *table; @@ -305,13 +307,13 @@ void db_redis_free_tables(km_redis_con_t *con) { ht = &con->tables; for (i = 0; i < ht->size; ++i) { last = (&ht->table[i])->prev; - clist_foreach(&ht->table[i], he, next) { + clist_foreach_safe(&ht->table[i], he, he_b, next) { table = (redis_table_t*) he->u.p; col_ht = &table->columns; for (j = 0; j < col_ht->size; ++j) { col_last = (&col_ht->table[j])->prev; - clist_foreach(&col_ht->table[j], col_he, next) { + clist_foreach_safe(&col_ht->table[j], col_he, col_he_b, next) { pkg_free(col_he->key.s); if (col_he == col_last) { pkg_free(col_he);

5 years, 11 months

git:master:de48be80: core: fix a resource leak in the case for memory allocation error

by Henning Westerholt

Module: kamailio Branch: master Commit: de48be80ae5a6380434913bd177e17c7d8cb42c5 URL: https://github.com/kamailio/kamailio/commit/de48be80ae5a6380434913bd177e17c… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-25T23:41:57+01:00 core: fix a resource leak in the case for memory allocation error --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/de48be80ae5a6380434913bd177e17c… Patch: https://github.com/kamailio/kamailio/commit/de48be80ae5a6380434913bd177e17c… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 16704a6f29..0ba1be5fe3 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -215,7 +215,8 @@ static int new_addr_info2list(char* name, enum si_flags f, -/* another helper function, it just creates a socket_info struct */ +/* another helper function, it just creates a socket_info struct + * allocates a si and a si->name in new pkg memory */ static inline struct socket_info* new_sock_info( char* name, struct name_lst* addr_l, unsigned short port, unsigned short proto, @@ -702,7 +703,7 @@ static struct socket_info* new_sock2list(char* name, struct name_lst* addr_l, struct socket_info** list) { struct socket_info* si; - + /* allocates si and si->name in new pkg memory */ si=new_sock_info(name, addr_l, port, proto, usename, useport, flags); if (si==0){ LM_ERR("new_sock_info failed\n"); @@ -718,6 +719,8 @@ static struct socket_info* new_sock2list(char* name, struct name_lst* addr_l, si->mcast.s=(char*)pkg_malloc(si->mcast.len+1); if (si->mcast.s==0) { PKG_MEM_ERROR; + pkg_free(si->name.s); + pkg_free(si); return 0; } strcpy(si->mcast.s, mcast);

5 years, 11 months

git:master:9d38aa06: core: fix two errors introduced in commit #e3ecad34bb13e

by Henning Westerholt

Module: kamailio Branch: master Commit: 9d38aa06d645bc44e37052d9b315474a99503359 URL: https://github.com/kamailio/kamailio/commit/9d38aa06d645bc44e37052d9b315474… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-25T23:26:15+01:00 core: fix two errors introduced in commit #e3ecad34bb13e --- Modified: src/core/str_hash.h Modified: src/core/xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/9d38aa06d645bc44e37052d9b315474… Patch: https://github.com/kamailio/kamailio/commit/9d38aa06d645bc44e37052d9b315474… --- diff --git a/src/core/str_hash.h b/src/core/str_hash.h index 8c6589f449..8755a6272c 100644 --- a/src/core/str_hash.h +++ b/src/core/str_hash.h @@ -57,9 +57,10 @@ struct str_hash_table{ inline static int str_hash_alloc(struct str_hash_table* ht, int size) { ht->table=(struct str_hash_head*)pkg_malloc(sizeof(struct str_hash_head)*size); - if (ht->table==0) + if (ht->table==0) { PKG_MEM_ERROR; return -1; + } ht->size=size; return 0; } diff --git a/src/core/xavp.c b/src/core/xavp.c index 2680cf71fa..2c725e92ee 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -92,9 +92,10 @@ static sr_xavp_t *xavp_new_value(str *name, sr_xval_t *val) if(val->type == SR_XTYPE_STR) size += val->v.s.len + 1; avp = (sr_xavp_t*)shm_malloc(size); - if(avp==NULL) + if(avp==NULL) { SHM_MEM_ERROR; return NULL; + } memset(avp, 0, size); avp->id = id; avp->name.s = (char*)avp + sizeof(sr_xavp_t);

5 years, 11 months

← Newer
1
...
11
12
13
14
15
16
17
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2018