sr-dev May 2021

sr-dev@lists.kamailio.org

12 participants
286 discussions

git:master:5d0f147b: pv: added function to set the value for $ccp(key)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5d0f147be45495cd836da4656ece5549f9859815 URL: https://github.com/kamailio/kamailio/commit/5d0f147be45495cd836da4656ece554… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-16T12:23:02+02:00 pv: added function to set the value for $ccp(key) --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/5d0f147be45495cd836da4656ece554… Patch: https://github.com/kamailio/kamailio/commit/5d0f147be45495cd836da4656ece554… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 16460f9bb3..ea6dab4940 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -540,7 +540,7 @@ static pv_export_t mod_pvs[] = { pv_parse_ksr_attrs_name, 0, 0, 0 }, {{"rpl", (sizeof("rpl")-1)}, PVT_OTHER, pv_get_rpl_attrs, 0, pv_parse_rpl_attrs_name, 0, 0, 0}, - {{"ccp", (sizeof("ccp")-1)}, PVT_OTHER, pv_get_ccp_attrs, 0, + {{"ccp", (sizeof("ccp")-1)}, PVT_OTHER, pv_get_ccp_attrs, pv_set_ccp_attrs, pv_parse_ccp_attrs_name, 0, 0, 0}, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 15ab3acb48..2c4692fecc 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -4057,3 +4057,54 @@ int pv_get_ccp_attrs(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) LM_ERR("unknown type for variable [%.*s]\n", s.len, s.s); return pv_get_null(msg, param, res); } + +/** + * + */ +int pv_set_ccp_attrs(struct sip_msg* msg, pv_param_t *param, + int op, pv_value_t *val) +{ + str gname = STR_NULL; + str vname = STR_NULL; + unsigned int *grpid = NULL; + str s = STR_NULL; + char *sep = NULL; + + if(val == NULL || (val->flags&PV_VAL_NULL)) { + LM_WARN("ignoring null asignment\n"); + return 0; + } + + s = param->pvn.u.isname.name.s; + + sep = q_memrchr(s.s, '.', s.len); + if(sep==NULL) { + LM_ERR("invalid pv name [%.*s]\n", s.len, s.s); + return -1; + } + gname.s = s.s; + gname.len = sep - s.s; + vname.s = sep + 1; + vname.len = s.s + s.len - sep - 1; + + if (cfg_get_group_id(&gname, &grpid)) { + LM_ERR("wrong group syntax. Use either 'group', or 'group[id]'\n"); + return -1; + } + + LM_DBG("setting value for variable: %.*s.%.*s\n", gname.len, gname.s, + vname.len, vname.s); + + if(val->flags&PV_TYPE_INT) { + if(cfg_set_now_int(_pv_ccp_ctx, &gname, grpid, &vname, val->ri)) { + LM_ERR("failed to set int to the variable: [%.*s]\n", s.len, s.s); + return -1; + } + } else { + if(cfg_set_now_str(_pv_ccp_ctx, &gname, grpid, &vname, &val->rs)) { + LM_ERR("failed to set str to the variable: [%.*s]\n", s.len, s.s); + return -1; + } + } + return 0; +} diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 70ef3f155c..359fabf850 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -402,6 +402,8 @@ int pv_ccp_ctx_init(void); int pv_parse_ccp_attrs_name(pv_spec_p sp, str *in); int pv_get_ccp_attrs(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); +int pv_set_ccp_attrs(struct sip_msg* msg, pv_param_t *param, + int op, pv_value_t *val); #endif

3 years

git:master:b09d4852: cfg_rpc: clang format

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b09d485274a06a62264649b9fb20df84c0d6cff9 URL: https://github.com/kamailio/kamailio/commit/b09d485274a06a62264649b9fb20df8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-15T09:19:55+02:00 cfg_rpc: clang format --- Modified: src/modules/cfg_rpc/cfg_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/b09d485274a06a62264649b9fb20df8… Patch: https://github.com/kamailio/kamailio/commit/b09d485274a06a62264649b9fb20df8…

3 years

git:master:061a66f8: cfg_rpc: removed history and svn id

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 061a66f88a91bc3e05224ef95043ebe4fec16dd1 URL: https://github.com/kamailio/kamailio/commit/061a66f88a91bc3e05224ef95043ebe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-15T08:58:27+02:00 cfg_rpc: removed history and svn id --- Modified: src/modules/cfg_rpc/Makefile Modified: src/modules/cfg_rpc/cfg_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/061a66f88a91bc3e05224ef95043ebe… Patch: https://github.com/kamailio/kamailio/commit/061a66f88a91bc3e05224ef95043ebe… --- diff --git a/src/modules/cfg_rpc/Makefile b/src/modules/cfg_rpc/Makefile index a7a980d873..d4e58b4c92 100644 --- a/src/modules/cfg_rpc/Makefile +++ b/src/modules/cfg_rpc/Makefile @@ -1,5 +1,5 @@ # cfg_rpc module makefile -# +# # WARNING: do not run this directly, it should be run by the main Makefile include ../../Makefile.defs diff --git a/src/modules/cfg_rpc/cfg_rpc.c b/src/modules/cfg_rpc/cfg_rpc.c index e31429f713..30c72e6083 100644 --- a/src/modules/cfg_rpc/cfg_rpc.c +++ b/src/modules/cfg_rpc/cfg_rpc.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2007 iptelorg GmbH * * This file is part of ser, a free SIP server. @@ -24,9 +22,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - * History - * ------- - * 2007-12-03 Initial version (Miklos) */ #include "../../core/sr_module.h"

3 years

git:master:696d5b90: pv: added $ccp(gname.vname) variable

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 696d5b909f02fa34ccdc0b388dcaac7381eb32ca URL: https://github.com/kamailio/kamailio/commit/696d5b909f02fa34ccdc0b388dcaac7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-14T10:41:29+02:00 pv: added $ccp(gname.vname) variable - get the config custom parameter value - direct access without running through select variable --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/696d5b909f02fa34ccdc0b388dcaac7… Patch: https://github.com/kamailio/kamailio/commit/696d5b909f02fa34ccdc0b388dcaac7…

3 years

git:master:9fcb5710: cfg-rpc: get_group_id() pints to cfg_get_group_id()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9fcb5710e01b61c91df85bcf144cbda68b730ae0 URL: https://github.com/kamailio/kamailio/commit/9fcb5710e01b61c91df85bcf144cbda… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-14T10:33:33+02:00 cfg-rpc: get_group_id() pints to cfg_get_group_id() --- Modified: src/modules/cfg_rpc/cfg_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/9fcb5710e01b61c91df85bcf144cbda… Patch: https://github.com/kamailio/kamailio/commit/9fcb5710e01b61c91df85bcf144cbda… --- diff --git a/src/modules/cfg_rpc/cfg_rpc.c b/src/modules/cfg_rpc/cfg_rpc.c index 2cab2a47cd..e31429f713 100644 --- a/src/modules/cfg_rpc/cfg_rpc.c +++ b/src/modules/cfg_rpc/cfg_rpc.c @@ -54,34 +54,7 @@ static int mod_init(void) * *group_id is set to null in the former case. * Warning: changes the group string */ -static int get_group_id(str *group, unsigned int **group_id) -{ - static unsigned int id; - str s; - - if (!group->s || (group->s[group->len-1] != ']')) { - *group_id = NULL; - return 0; - } - - s.s = group->s + group->len - 2; - s.len = 0; - while ((s.s > group->s) && (*s.s != '[')) { - s.s--; - s.len++; - } - if (s.s == group->s) /* '[' not found */ - return -1; - group->len = s.s - group->s; - s.s++; - if (!group->len || !s.len) - return -1; - if (str2int(&s, &id)) - return -1; - - *group_id = &id; - return 0; -} +#define get_group_id(group, group_id) cfg_get_group_id(group, group_id) static const char* rpc_set_now_doc[2] = { "Set the value of a configuration variable and commit the change immediately",

3 years

git:master:899a1048: core: cfg - added cfg_get_group_id to the config var framework api

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 899a10489e14a834267fcfbba36cc5aacdf45633 URL: https://github.com/kamailio/kamailio/commit/899a10489e14a834267fcfbba36cc5a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-14T10:32:31+02:00 core: cfg - added cfg_get_group_id to the config var framework api --- Modified: src/core/cfg/cfg.c Modified: src/core/cfg/cfg.h --- Diff: https://github.com/kamailio/kamailio/commit/899a10489e14a834267fcfbba36cc5a… Patch: https://github.com/kamailio/kamailio/commit/899a10489e14a834267fcfbba36cc5a… --- diff --git a/src/core/cfg/cfg.c b/src/core/cfg/cfg.c index 488d72f35a..80e3fe3e55 100644 --- a/src/core/cfg/cfg.c +++ b/src/core/cfg/cfg.c @@ -285,3 +285,39 @@ void **cfg_get_handle(char *gname) return group->handle; } + + +/* Set the group_id pointer based on the group string. + * The string is either "group_name", or "group_name[group_id]" + * *group_id is set to null in the former case. + * Warning: changes the group string + */ +int cfg_get_group_id(str *group, unsigned int **group_id) +{ + static unsigned int id; + str s; + + if (!group->s || (group->s[group->len-1] != ']')) { + *group_id = NULL; + return 0; + } + + s.s = group->s + group->len - 2; + s.len = 0; + while ((s.s > group->s) && (*s.s != '[')) { + s.s--; + s.len++; + } + if (s.s == group->s) /* '[' not found */ + return -1; + group->len = s.s - group->s; + s.s++; + if (!group->len || !s.len) + return -1; + if (str2int(&s, &id)) + return -1; + + *group_id = &id; + return 0; +} + diff --git a/src/core/cfg/cfg.h b/src/core/cfg/cfg.h index b3c5a1ba29..19cb824055 100644 --- a/src/core/cfg/cfg.h +++ b/src/core/cfg/cfg.h @@ -102,4 +102,7 @@ int cfg_new_ginst(char *group_name, unsigned int group_id); /*! \brief returns the handle of a cfg group */ void **cfg_get_handle(char *gname); +/*! \brief get the id of a cfg group */ +int cfg_get_group_id(str *group, unsigned int **group_id); + #endif /* _CFG_H */

3 years

[kamailio/kamailio] is_first_hop() not processing FQDN in RR header in a case of reply (#2732)

by Igor Olhovskiy

### Description In the case of using FQDN in `listen = ... advertise ... ` FQDN is populated in the `Record-Route` header. In this case `is_first_hop()` function is not returning true even if `FQDN == myself` in replies. #### Reproduction Add FQND in advertise and check `is_first_hop()` result in a case of reply #### Log Messages ``` siputils [sipops.c:185]: is_first_hop(): uri host is not an ip address ``` ### Possible Solutions Not use `is_first_hop()` in the case of reply/FQDN in advertising. ### Additional Information version: kamailio 5.4.4 (x86_64/linux) e16352 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, 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: e16352 compiled on 09:50:10 May 7 2021 with gcc 4.8.5 * **Operating System**: ``` # uname -a Linux fe-0513-2-dev 3.10.0-1160.21.1.el7.x86_64 #1 SMP Tue Mar 16 18:28:22 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux ``` https://github.com/kamailio/kamailio/blob/02240711239149e2f5c4890a70ab158d1… -- 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/2732

3 years

[kamailio/kamailio] Topos: critical error after upgrade to 5.5 (#2734)

by Boris Korzun

### Description I've faced a critical error in the log after upgrade to 5.5 on _topos_ module. ### Troubleshooting It looks like _ki_tps_set_context()_ tries to free incorrectly defined variable __tps_context_value_. #### Reproduction ``` loadmodule "topos.so" modparam("topos", "storage", "db") modparam("topos", "db_url", DBURL_PRIMARY) modparam("topos", "sanity_checks", 1) modparam("topos", "branch_expire", 300) modparam("topos", "dialog_expire", 7200) modparam("topos", "clean_interval", 120) ``` #### Log Messages ``` 20:59:43.951476 kamailio 81412 CRITICAL: <core> [core/mem/q_malloc.c:502]: qm_free(): BUG: bad pointer 0x82310fbdc (out of memory block!) called from topos: topos_mod.c: ki_tps_set_context(315) - ignoring 20:59:58.925224 kamailio 81413 CRITICAL: <core> [core/mem/q_malloc.c:502]: qm_free(): BUG: bad pointer 0x82310fbdc (out of memory block!) called from topos: topos_mod.c: ki_tps_set_context(315) - ignoring 21:00:13.930896 kamailio 81414 CRITICAL: <core> [core/mem/q_malloc.c:502]: qm_free(): BUG: bad pointer 0x82310fbdc (out of memory block!) called from topos: topos_mod.c: ki_tps_set_context(315) - ignoring 21:00:28.929303 kamailio 81415 CRITICAL: <core> [core/mem/q_malloc.c:502]: qm_free(): BUG: bad pointer 0x82310fbdc (out of memory block!) called from topos: topos_mod.c: ki_tps_set_context(315) - ignoring 21:00:43.925256 kamailio 81416 CRITICAL: <core> [core/mem/q_malloc.c:502]: qm_free(): BUG: bad pointer 0x82310fbdc (out of memory block!) called from topos: topos_mod.c: ki_tps_set_context(315) - ignoring 21:00:58.925535 kamailio 81417 CRITICAL: <core> [core/mem/q_malloc.c:502]: qm_free(): BUG: bad pointer 0x82310fbdc (out of memory block!) called from topos: topos_mod.c: ki_tps_set_context(315) - ignoring 21:01:13.925081 kamailio 81418 CRITICAL: <core> [core/mem/q_malloc.c:502]: qm_free(): BUG: bad pointer 0x82310fbdc (out of memory block!) called from topos: topos_mod.c: ki_tps_set_context(315) - ignoring 21:01:28.925306 kamailio 81419 CRITICAL: <core> [core/mem/q_malloc.c:502]: qm_free(): BUG: bad pointer 0x82310fbdc (out of memory block!) called from topos: topos_mod.c: ki_tps_set_context(315) - ignoring ``` ### Additional Information ``` version: kamailio 5.5.0 (x86_64/freebsd) d4c1a1 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, select, kqueue. id: d4c1a1 compiled on 13:02:36 May 13 2021 with cc FreeBSD clang version 10.0.1 (git@github.com:llvm/llvm-project.git llvmorg-10.0.1-0-gef32c611aa2) ``` * **Operating System**: FreeBSD 13 -- 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/2734

3 years

git:5.5:d2fd064a: topos: init xavp and context modparams to str null

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: d2fd064af771df2ffe6c7a78c05d75facdfa50bf URL: https://github.com/kamailio/kamailio/commit/d2fd064af771df2ffe6c7a78c05d75f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-13T17:55:14+02:00 topos: init xavp and context modparams to str null (cherry picked from commit 5e3f7e1557d90a3e6f40eff41cc0b0bb317ab544) --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d2fd064af771df2ffe6c7a78c05d75f… Patch: https://github.com/kamailio/kamailio/commit/d2fd064af771df2ffe6c7a78c05d75f… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index ba58920a6c..498cc8defe 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -107,13 +107,13 @@ str _tps_contact_host = str_init(""); int _tps_contact_mode = 0; str _tps_cparam_name = str_init("tps"); -str _tps_xavu_cfg = str_init(""); -str _tps_xavu_field_acontact = str_init(""); -str _tps_xavu_field_bcontact = str_init(""); -str _tps_xavu_field_contact_host = str_init(""); +str _tps_xavu_cfg = STR_NULL; +str _tps_xavu_field_acontact = STR_NULL; +str _tps_xavu_field_bcontact = STR_NULL; +str _tps_xavu_field_contact_host = STR_NULL; -str _tps_context_param = str_init(""); -str _tps_context_value = str_init(""); +str _tps_context_param = STR_NULL; +str _tps_context_value = STR_NULL; sanity_api_t scb; @@ -247,7 +247,8 @@ static int mod_init(void) if(sruid_init(&_tps_sruid, '-', "tpsh", SRUID_INC)<0) return -1; - if (_tps_contact_mode == 2 && (_tps_xavu_field_acontact.len <= 0 + if (_tps_contact_mode == 2 && (_tps_xavu_cfg.len <= 0 + || _tps_xavu_field_acontact.len <= 0 || _tps_xavu_field_bcontact.len <= 0)) { LM_ERR("contact_mode parameter is 2," " but a_contact or b_contact xavu fields not defined\n");

3 years

git:5.5:6a5a61bf: core: xavp - safety checks for name len

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 6a5a61bfab80116338f6a9c91ed7ec5f7b98923b URL: https://github.com/kamailio/kamailio/commit/6a5a61bfab80116338f6a9c91ed7ec5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-13T17:55:06+02:00 core: xavp - safety checks for name len (cherry picked from commit d22d812da1c3b2a2f65f142ef5ed5fa07e8ab072) --- Modified: src/core/xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/6a5a61bfab80116338f6a9c91ed7ec5… Patch: https://github.com/kamailio/kamailio/commit/6a5a61bfab80116338f6a9c91ed7ec5… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index b11b99929d..036a5ffbe1 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -106,7 +106,7 @@ static sr_xavp_t *xavp_new_value(str *name, sr_xval_t *val) int size; unsigned int id; - if(name==NULL || name->s==NULL || val==NULL) + if(name==NULL || name->s==NULL || name->len<=0 || val==NULL) return NULL; id = get_hash1_raw(name->s, name->len); @@ -427,7 +427,7 @@ static int xavp_rm_internal(str *name, sr_xavp_t **head, int idx) int n=0; int count=0; - if(name==NULL || name->s==NULL) + if(name==NULL || name->s==NULL || name->len<=0) return 0; id = get_hash1_raw(name->s, name->len); @@ -498,7 +498,7 @@ int xavp_count(str *name, sr_xavp_t **start) unsigned int id; int n = 0; - if(name==NULL || name->s==NULL) + if(name==NULL || name->s==NULL || name->len<=0) return -1; id = get_hash1_raw(name->s, name->len); @@ -865,7 +865,7 @@ sr_xavp_t *xavp_extract(str *name, sr_xavp_t **list) sr_xavp_t *prv = 0; unsigned int id; - if(name==NULL || name->s==NULL) { + if(name==NULL || name->s==NULL || name->len<=0) { if(list!=NULL) { avp = *list; if(avp!=NULL) { @@ -1157,7 +1157,7 @@ static sr_xavp_t *xavu_get_internal(str *name, sr_xavp_t **list, sr_xavp_t **prv sr_xavp_t *avu; unsigned int id; - if(name==NULL || name->s==NULL) { + if(name==NULL || name->s==NULL || name->len<=0) { return NULL; } @@ -1235,7 +1235,7 @@ int xavu_rm_by_name(str *name, sr_xavp_t **head) unsigned int id; - if(name==NULL || name->s==NULL) { + if(name==NULL || name->s==NULL || name->len<=0) { return -1; } @@ -1579,7 +1579,7 @@ static sr_xavp_t *xavi_new_value(str *name, sr_xval_t *val) int size; unsigned int id; - if(name==NULL || name->s==NULL || val==NULL) + if(name==NULL || name->s==NULL || name->len<=0 || val==NULL) return NULL; id = get_hash1_case_raw(name->s, name->len); @@ -1812,7 +1812,7 @@ static sr_xavp_t *xavi_get_internal(str *name, sr_xavp_t **list, int idx, sr_xav unsigned int id; int n = 0; - if(name==NULL || name->s==NULL) + if(name==NULL || name->s==NULL || name->len<=0) return NULL; id = get_hash1_case_raw(name->s, name->len); @@ -1939,7 +1939,7 @@ static int xavi_rm_internal(str *name, sr_xavp_t **head, int idx) int n=0; int count=0; - if(name==NULL || name->s==NULL) + if(name==NULL || name->s==NULL || name->len<=0) return 0; id = get_hash1_case_raw(name->s, name->len); @@ -2022,7 +2022,7 @@ int xavi_count(str *name, sr_xavp_t **start) unsigned int id; int n = 0; - if(name==NULL || name->s==NULL) + if(name==NULL || name->s==NULL || name->len<=0) return -1; id = get_hash1_case_raw(name->s, name->len); @@ -2315,7 +2315,7 @@ sr_xavp_t *xavi_extract(str *name, sr_xavp_t **list) sr_xavp_t *prv = 0; unsigned int id; - if(name==NULL || name->s==NULL) { + if(name==NULL || name->s==NULL || name->len<=0) { if(list!=NULL) { avi = *list; if(avi!=NULL) {

3 years

← Newer
1
...
15
16
17
18
19
20
21
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2021