sr-dev April 2022

sr-dev@lists.kamailio.org

17 participants
284 discussions

[kamailio/kamailio] htable: wrong printf format (PR #3086)

by liviu-rolo

"%*.s" used instead of "%.*s"   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description "%*.s" used instead of "%.*s": "The result is padded with space characters" (https://en.cppreference.com/w/cpp/io/c/fprintf) Probably harmless (but still wrong) if the string ends with '\0'. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3086 -- Commit Summary -- * wrong printf format -- File Changes -- M src/modules/htable/ht_db.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3086.patch https://github.com/kamailio/kamailio/pull/3086.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3086 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3086(a)github.com>

2 years, 7 months

git:master:c259eb64: wrong printf format

by Henning Westerholt

Module: kamailio Branch: master Commit: c259eb6421713165d0800c030a589c867fe4da22 URL: https://github.com/kamailio/kamailio/commit/c259eb6421713165d0800c030a589c8… Author: liviu-rolo <82887358+liviu-rolo(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-04-19T11:45:27+02:00 wrong printf format "%*.s" used instead of "%.*s": "The result is padded with space characters" (https://en.cppreference.com/w/cpp/io/c/fprintf) Probably harmless (but still wrong) if the string ends with '\0'. --- Modified: src/modules/htable/ht_db.c --- Diff: https://github.com/kamailio/kamailio/commit/c259eb6421713165d0800c030a589c8… Patch: https://github.com/kamailio/kamailio/commit/c259eb6421713165d0800c030a589c8… --- diff --git a/src/modules/htable/ht_db.c b/src/modules/htable/ht_db.c index cbce085f6c..bbcba99913 100644 --- a/src/modules/htable/ht_db.c +++ b/src/modules/htable/ht_db.c @@ -495,7 +495,7 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) if (ht->htexpire > 0 && expires.n > 0) { expires.n -= now; if(ht_set_cell_expire(ht, &hname, 0, &expires)) { - LM_ERR("error setting expires to hash entry [%*.s]\n", hname.len, hname.s); + LM_ERR("error setting expires to hash entry [%.*s]\n", hname.len, hname.s); goto error; } }

2 years, 7 months

git:master:95bf86dc: siprepo: updates to kemi exports signatures

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 95bf86dc2900b707d4b9bfa2005fcea6c17c3410 URL: https://github.com/kamailio/kamailio/commit/95bf86dc2900b707d4b9bfa2005fcea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-19T08:50:51+02:00 siprepo: updates to kemi exports signatures --- Modified: src/modules/siprepo/siprepo_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/95bf86dc2900b707d4b9bfa2005fcea… Patch: https://github.com/kamailio/kamailio/commit/95bf86dc2900b707d4b9bfa2005fcea… --- diff --git a/src/modules/siprepo/siprepo_mod.c b/src/modules/siprepo/siprepo_mod.c index 59473b0388..35a9778743 100644 --- a/src/modules/siprepo/siprepo_mod.c +++ b/src/modules/siprepo/siprepo_mod.c @@ -344,18 +344,18 @@ static void siprepo_timer_exec(unsigned int ticks, int worker, void *param) static sr_kemi_t sr_kemi_sworker_exports[] = { { str_init("siprepo"), str_init("sr_msg_push"), SR_KEMIP_INT, ki_sr_msg_push, - { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("siprepo"), str_init("sr_msg_pull"), SR_KEMIP_INT, ki_sr_msg_pull, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, - SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("siprepo"), str_init("sr_msg_async_pull"), SR_KEMIP_INT, ki_sr_msg_async_pull, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, - SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE } + SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE } }, { str_init("siprepo"), str_init("sr_msg_rm"), SR_KEMIP_INT, ki_sr_msg_rm,

2 years, 7 months

git:master:9601f651: pv_headers: update kemi exports signatures to match c code

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9601f651ecdbf5e816f15fc6aedce9981d4afae7 URL: https://github.com/kamailio/kamailio/commit/9601f651ecdbf5e816f15fc6aedce99… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-18T09:16:34+02:00 pv_headers: update kemi exports signatures to match c code --- Modified: src/modules/pv_headers/pv_headers.c --- Diff: https://github.com/kamailio/kamailio/commit/9601f651ecdbf5e816f15fc6aedce99… Patch: https://github.com/kamailio/kamailio/commit/9601f651ecdbf5e816f15fc6aedce99… --- diff --git a/src/modules/pv_headers/pv_headers.c b/src/modules/pv_headers/pv_headers.c index be43bb29f4..fb20dfcc02 100644 --- a/src/modules/pv_headers/pv_headers.c +++ b/src/modules/pv_headers/pv_headers.c @@ -590,13 +590,13 @@ static sr_kemi_t pvh_kemi_exports[] = { }, { str_init("pv_headers"), str_init("pvh_header_param_exists"), SR_KEMIP_INT, pvh_header_param_exists, - { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE} }, { str_init("pv_headers"), str_init("pvh_remove_header_param"), SR_KEMIP_INT, pvh_remove_header_param, - { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, - SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE} + { SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE} }, {{0, 0}, {0, 0}, 0, NULL, {0, 0, 0, 0, 0, 0}} };

2 years, 7 months

git:master:6cddfb88: kamctl: version set to 5.6.0

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6cddfb888d5622a986f2e5b57fe3a36f81632cfd URL: https://github.com/kamailio/kamailio/commit/6cddfb888d5622a986f2e5b57fe3a36… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-16T15:24:59+02:00 kamctl: version set to 5.6.0 --- Modified: utils/kamctl/kamctl --- Diff: https://github.com/kamailio/kamailio/commit/6cddfb888d5622a986f2e5b57fe3a36… Patch: https://github.com/kamailio/kamailio/commit/6cddfb888d5622a986f2e5b57fe3a36… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index a83720fcde..b4b861763a 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -5,7 +5,7 @@ #=================================================================== ### version for this script -VERSION='5.4.0' +VERSION='5.6.0' PATH=$PATH:/usr/local/sbin/

2 years, 7 months

git:master:03726a3f: ims_registrar_scscf: fix build warning

by Victor Seva

Module: kamailio Branch: master Commit: 03726a3f04f860ead060ad2f7984b587ad10ab43 URL: https://github.com/kamailio/kamailio/commit/03726a3f04f860ead060ad2f7984b58… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-04-15T13:23:49+02:00 ims_registrar_scscf: fix build warning > userdata_parser.c: In function 'parse_user_data': > userdata_parser.c:930:23: warning: pointer targets in passing argument 1 > of 'xmlParseMemory' differ in signedness [-Wpointer-sign] > 930 | doc = xmlParseMemory((unsigned char *)xml.s, xml.len); > | ^~~~~~~~~~~~~~~~~~~~~~ > | | > | unsigned char * > In file included from /usr/include/libxml2/libxml/globals.h:18, > from /usr/include/libxml2/libxml/threads.h:35, > from /usr/include/libxml2/libxml/xmlmemory.h:218, > from /usr/include/libxml2/libxml/tree.h:1307, > from /usr/include/libxml2/libxml/xmlschemas.h:19, > from userdata_parser.h:47, > from userdata_parser.c:44: > /usr/include/libxml2/libxml/parser.h:846:32: note: expected 'const char > *' but argument is of type 'unsigned char *' > 846 | xmlParseMemory (const char *buffer, > | ~~~~~~~~~~~~^~~~~~ --- Modified: src/modules/ims_registrar_scscf/userdata_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/03726a3f04f860ead060ad2f7984b58… Patch: https://github.com/kamailio/kamailio/commit/03726a3f04f860ead060ad2f7984b58… --- diff --git a/src/modules/ims_registrar_scscf/userdata_parser.c b/src/modules/ims_registrar_scscf/userdata_parser.c index d8b08b5491..43a5657c5b 100644 --- a/src/modules/ims_registrar_scscf/userdata_parser.c +++ b/src/modules/ims_registrar_scscf/userdata_parser.c @@ -927,7 +927,7 @@ ims_subscription *parse_user_data(str xml) if (!ctxtInit) parser_init(scscf_user_data_dtd,scscf_user_data_xsd); doc=0; - doc = xmlParseMemory((unsigned char *)xml.s, xml.len); + doc = xmlParseMemory(xml.s, xml.len); if (!doc){ LM_ERR("This is not a valid XML <%.*s>\n", xml.len,xml.s); goto error;

2 years, 7 months

git:master:3e46fc12: pv: remove unused variable

by Victor Seva

Module: kamailio Branch: master Commit: 3e46fc12adbee2c8d0b0dc4de4814d343762c52d URL: https://github.com/kamailio/kamailio/commit/3e46fc12adbee2c8d0b0dc4de4814d3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-04-15T13:17:25+02:00 pv: remove unused variable > pv_branch.c:623:13: warning: unused variable 's' [-Wunused-variable] --- Modified: src/modules/pv/pv_branch.c --- Diff: https://github.com/kamailio/kamailio/commit/3e46fc12adbee2c8d0b0dc4de4814d3… Patch: https://github.com/kamailio/kamailio/commit/3e46fc12adbee2c8d0b0dc4de4814d3… --- diff --git a/src/modules/pv/pv_branch.c b/src/modules/pv/pv_branch.c index 83cc273f12..22f3e7afa5 100644 --- a/src/modules/pv/pv_branch.c +++ b/src/modules/pv/pv_branch.c @@ -620,7 +620,6 @@ int pv_get_rcv(struct sip_msg *msg, pv_param_t *param, int pv_set_rcv(sip_msg_t *msg, pv_param_t *param, int op, pv_value_t *val) { sr_net_info_t *neti = NULL; - str s; neti = ksr_evrt_rcvnetinfo_get();

2 years, 7 months

git:master:6c15b875: pv_headers: fix build warning

by Victor Seva

Module: kamailio Branch: master Commit: 6c15b875c9763013afc1aafc1ae06c96c4e2c698 URL: https://github.com/kamailio/kamailio/commit/6c15b875c9763013afc1aafc1ae06c9… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-04-15T11:29:53+02:00 pv_headers: fix build warning pvh_func.c:392:35: warning: division 'sizeof (char *) / sizeof (char)' pvh_func.c:407:66: warning: division 'sizeof (char *) / sizeof (char)' --- Modified: src/modules/pv_headers/pvh_func.c --- Diff: https://github.com/kamailio/kamailio/commit/6c15b875c9763013afc1aafc1ae06c9… Patch: https://github.com/kamailio/kamailio/commit/6c15b875c9763013afc1aafc1ae06c9… --- diff --git a/src/modules/pv_headers/pvh_func.c b/src/modules/pv_headers/pvh_func.c index 4ca72d217d..c2a3f98e41 100644 --- a/src/modules/pv_headers/pvh_func.c +++ b/src/modules/pv_headers/pvh_func.c @@ -389,8 +389,7 @@ int pvh_remove_header_param(struct sip_msg *msg, int idx, str *hname, str *eleme char *token; char *result = (char*)pkg_malloc(elements->len - toRemove->len); char *t = (char*)pkg_malloc(elements->len); - int maxSize = sizeof(elements->s)/sizeof(char); - maxSize = maxSize < elements->len?elements->len:maxSize; + int maxSize = elements->len; if (result == NULL || t == NULL) { @@ -404,7 +403,7 @@ int pvh_remove_header_param(struct sip_msg *msg, int idx, str *hname, str *eleme token = strtok_r(t, ", ", &next_token); while(token) { - int notTarget = strncmp(token, toRemove->s, sizeof(toRemove->s)/sizeof(char)); + int notTarget = strncmp(token, toRemove->s, toRemove->len); if (notTarget) { int n = snprintf(result + offset, maxSize - offset, "%s", token);

2 years, 7 months

git:master:8964b1a9: pkg/kamailio/deb: version set 5.6.0~pre0

by Victor Seva

Module: kamailio Branch: master Commit: 8964b1a9819d9fd644a5a30b0fe4de9b3146501d URL: https://github.com/kamailio/kamailio/commit/8964b1a9819d9fd644a5a30b0fe4de9… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-04-15T09:04:56+02:00 pkg/kamailio/deb: version set 5.6.0~pre0 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bookworm/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/8964b1a9819d9fd644a5a30b0fe4de9… Patch: https://github.com/kamailio/kamailio/commit/8964b1a9819d9fd644a5a30b0fe4de9…

2 years, 7 months

git:master:a1d89de0: Makefile.defs: version set to 5.6.0-pre0

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a1d89de03b0274b642d35ee875a1985ee51a2cd8 URL: https://github.com/kamailio/kamailio/commit/a1d89de03b0274b642d35ee875a1985… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-15T08:30:04+02:00 Makefile.defs: version set to 5.6.0-pre0 - testing phase for v5.6.x series --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/a1d89de03b0274b642d35ee875a1985… Patch: https://github.com/kamailio/kamailio/commit/a1d89de03b0274b642d35ee875a1985… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index c167e2c11f..90aa777782 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 6 SUBLEVEL = 0 -EXTRAVERSION = -dev4 +EXTRAVERSION = -pre0 # memory manager switcher # 0 - f_malloc (fast malloc)

2 years, 7 months

← 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 April 2022