sr-dev November 2019

sr-dev@lists.kamailio.org

22 participants
381 discussions

git:5.3:404c3ee3: utils/db_berkeley: fixed unused var
by Henning Westerholt 18 Nov '19

18 Nov '19

Module: kamailio Branch: 5.3 Commit: 404c3ee38b6158d755f196c66f69eeee234f97e2 URL: https://github.com/kamailio/kamailio/commit/404c3ee38b6158d755f196c66f69eee… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-11-18T20:09:38+01:00 utils/db_berkeley: fixed unused var kambdb_recover.c: In function 'load_metadata_columns': kambdb_recover.c:819:6: warning: variable 'ret' set but not used [-Wunused-but-set-variable] 819 | int ret,n,len; | ^~~ (cherry picked from commit 792261b43d74518e6d67f807df60b6622ba2d9f8) --- Modified: utils/db_berkeley/kambdb_recover.c --- Diff: https://github.com/kamailio/kamailio/commit/404c3ee38b6158d755f196c66f69eee… Patch: https://github.com/kamailio/kamailio/commit/404c3ee38b6158d755f196c66f69eee… --- diff --git a/utils/db_berkeley/kambdb_recover.c b/utils/db_berkeley/kambdb_recover.c index 30733a01ff..a3fa82dfd6 100644 --- a/utils/db_berkeley/kambdb_recover.c +++ b/utils/db_berkeley/kambdb_recover.c @@ -816,11 +816,11 @@ table_p create_table(char *_s) */ int load_metadata_columns(table_p _tp, char* line) { - int ret,n,len; + int n,len; char *s = NULL; char cn[64], ct[16]; column_p col; - ret = n = len = 0; + n = len = 0; if(!_tp) return -1; if(_tp->ncols!=0) return 0;

1 0

git:5.1:1d3453e9: utils/db_berkeley: fixed unused var
by Henning Westerholt 18 Nov '19

18 Nov '19

Module: kamailio Branch: 5.1 Commit: 1d3453e999902323d9515fc8ef79e00c2e6698ba URL: https://github.com/kamailio/kamailio/commit/1d3453e999902323d9515fc8ef79e00… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-11-18T20:09:07+01:00 utils/db_berkeley: fixed unused var kambdb_recover.c: In function 'load_metadata_columns': kambdb_recover.c:819:6: warning: variable 'ret' set but not used [-Wunused-but-set-variable] 819 | int ret,n,len; | ^~~ (cherry picked from commit 792261b43d74518e6d67f807df60b6622ba2d9f8) --- Modified: utils/db_berkeley/kambdb_recover.c --- Diff: https://github.com/kamailio/kamailio/commit/1d3453e999902323d9515fc8ef79e00… Patch: https://github.com/kamailio/kamailio/commit/1d3453e999902323d9515fc8ef79e00… --- diff --git a/utils/db_berkeley/kambdb_recover.c b/utils/db_berkeley/kambdb_recover.c index 30733a01ff..a3fa82dfd6 100644 --- a/utils/db_berkeley/kambdb_recover.c +++ b/utils/db_berkeley/kambdb_recover.c @@ -816,11 +816,11 @@ table_p create_table(char *_s) */ int load_metadata_columns(table_p _tp, char* line) { - int ret,n,len; + int n,len; char *s = NULL; char cn[64], ct[16]; column_p col; - ret = n = len = 0; + n = len = 0; if(!_tp) return -1; if(_tp->ncols!=0) return 0;

1 0

git:5.2:ec04243c: utils/db_berkeley: fixed unused var
by Henning Westerholt 18 Nov '19

18 Nov '19

Module: kamailio Branch: 5.2 Commit: ec04243cd760532dc4aa87b278068b09d408d174 URL: https://github.com/kamailio/kamailio/commit/ec04243cd760532dc4aa87b278068b0… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-11-18T20:08:43+01:00 utils/db_berkeley: fixed unused var kambdb_recover.c: In function 'load_metadata_columns': kambdb_recover.c:819:6: warning: variable 'ret' set but not used [-Wunused-but-set-variable] 819 | int ret,n,len; | ^~~ (cherry picked from commit 792261b43d74518e6d67f807df60b6622ba2d9f8) --- Modified: utils/db_berkeley/kambdb_recover.c --- Diff: https://github.com/kamailio/kamailio/commit/ec04243cd760532dc4aa87b278068b0… Patch: https://github.com/kamailio/kamailio/commit/ec04243cd760532dc4aa87b278068b0… --- diff --git a/utils/db_berkeley/kambdb_recover.c b/utils/db_berkeley/kambdb_recover.c index 30733a01ff..a3fa82dfd6 100644 --- a/utils/db_berkeley/kambdb_recover.c +++ b/utils/db_berkeley/kambdb_recover.c @@ -816,11 +816,11 @@ table_p create_table(char *_s) */ int load_metadata_columns(table_p _tp, char* line) { - int ret,n,len; + int n,len; char *s = NULL; char cn[64], ct[16]; column_p col; - ret = n = len = 0; + n = len = 0; if(!_tp) return -1; if(_tp->ncols!=0) return 0;

1 0

[kamailio/kamailio] utils/db_berkeley: fixed unused var (#2136)
by sergey-safarov 18 Nov '19

18 Nov '19

kambdb_recover.c: In function 'load_metadata_columns': kambdb_recover.c:819:6: warning: variable 'ret' set but not used [-Wunused-but-set-variable] 819 | int ret,n,len; | ^~~ #### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] 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:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Fixed not used vars on Fedora 31 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2136 -- Commit Summary -- * utils/db_berkeley: fixed unused var -- File Changes -- M utils/db_berkeley/kambdb_recover.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2136.patch https://github.com/kamailio/kamailio/pull/2136.diff -- 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/pull/2136

2 2

git:master:792261b4: utils/db_berkeley: fixed unused var
by Henning Westerholt 18 Nov '19

18 Nov '19

Module: kamailio Branch: master Commit: 792261b43d74518e6d67f807df60b6622ba2d9f8 URL: https://github.com/kamailio/kamailio/commit/792261b43d74518e6d67f807df60b66… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-11-18T20:07:54+01:00 utils/db_berkeley: fixed unused var kambdb_recover.c: In function 'load_metadata_columns': kambdb_recover.c:819:6: warning: variable 'ret' set but not used [-Wunused-but-set-variable] 819 | int ret,n,len; | ^~~ --- Modified: utils/db_berkeley/kambdb_recover.c --- Diff: https://github.com/kamailio/kamailio/commit/792261b43d74518e6d67f807df60b66… Patch: https://github.com/kamailio/kamailio/commit/792261b43d74518e6d67f807df60b66… --- diff --git a/utils/db_berkeley/kambdb_recover.c b/utils/db_berkeley/kambdb_recover.c index 30733a01ff..a3fa82dfd6 100644 --- a/utils/db_berkeley/kambdb_recover.c +++ b/utils/db_berkeley/kambdb_recover.c @@ -816,11 +816,11 @@ table_p create_table(char *_s) */ int load_metadata_columns(table_p _tp, char* line) { - int ret,n,len; + int n,len; char *s = NULL; char cn[64], ct[16]; column_p col; - ret = n = len = 0; + n = len = 0; if(!_tp) return -1; if(_tp->ncols!=0) return 0;

1 0

git:master:c8de7e9b: utils/kamunix: use snprintf() instead of sprintf()
by Daniel-Constantin Mierla 18 Nov '19

18 Nov '19

Module: kamailio Branch: master Commit: c8de7e9bbb515449761b02b897ccaa10a250e25b URL: https://github.com/kamailio/kamailio/commit/c8de7e9bbb515449761b02b897ccaa1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-18T18:33:22+01:00 utils/kamunix: use snprintf() instead of sprintf() --- Modified: utils/kamunix/kamunix.c --- Diff: https://github.com/kamailio/kamailio/commit/c8de7e9bbb515449761b02b897ccaa1… Patch: https://github.com/kamailio/kamailio/commit/c8de7e9bbb515449761b02b897ccaa1… --- diff --git a/utils/kamunix/kamunix.c b/utils/kamunix/kamunix.c index 7612a9e32d..6b06e29a2e 100644 --- a/utils/kamunix/kamunix.c +++ b/utils/kamunix/kamunix.c @@ -75,7 +75,7 @@ int main(int argc, char** argv) chroot_dir = getenv("CHROOT_DIR"); if (chroot_dir == NULL) chroot_dir = ""; - sprintf(name, "%s/tmp/Kamailio.%d.XXXXXX", chroot_dir, getpid()); + snprintf(name, 256, "%s/tmp/Kamailio.%d.XXXXXX", chroot_dir, getpid()); umask(0); /* set mode to 0666 for when Kamailio is running as non-root user * and kamctl is running as root */

1 0

git:master:05bd956a: cnxcc: use snprintf() instead of sprintf()
by Daniel-Constantin Mierla 18 Nov '19

18 Nov '19

Module: kamailio Branch: master Commit: 05bd956a9980ffc8938cdbce6bab3af5086350dd URL: https://github.com/kamailio/kamailio/commit/05bd956a9980ffc8938cdbce6bab3af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-18T18:29:05+01:00 cnxcc: use snprintf() instead of sprintf() --- Modified: src/modules/cnxcc/cnxcc_sip_msg_faker.c --- Diff: https://github.com/kamailio/kamailio/commit/05bd956a9980ffc8938cdbce6bab3af… Patch: https://github.com/kamailio/kamailio/commit/05bd956a9980ffc8938cdbce6bab3af… --- diff --git a/src/modules/cnxcc/cnxcc_sip_msg_faker.c b/src/modules/cnxcc/cnxcc_sip_msg_faker.c index 7b601d537a..dbb8694f6a 100644 --- a/src/modules/cnxcc/cnxcc_sip_msg_faker.c +++ b/src/modules/cnxcc/cnxcc_sip_msg_faker.c @@ -40,7 +40,7 @@ int faked_msg_init_with_dlg_info(str *callid, str *from_uri, str *from_tag, { memset(_faked_sip_msg_buf, 0, FAKED_SIP_MSG_BUF_LEN); - sprintf(_faked_sip_msg_buf, FAKED_SIP_MSG_FORMAT, from_uri->len, + snprintf(_faked_sip_msg_buf, FAKED_SIP_MSG_BUF_LEN, FAKED_SIP_MSG_FORMAT, from_uri->len, from_uri->s, from_tag->len, from_tag->s, to_uri->len, to_uri->s, to_tag->len, to_tag->s, callid->len, callid->s);

1 0

git:master:88b8ec8f: acc_radius: use snprintf() instead of sprintf()
by Daniel-Constantin Mierla 18 Nov '19

18 Nov '19

Module: kamailio Branch: master Commit: 88b8ec8f2021fcc53289544102e5c5020885f8c3 URL: https://github.com/kamailio/kamailio/commit/88b8ec8f2021fcc53289544102e5c50… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-18T18:24:36+01:00 acc_radius: use snprintf() instead of sprintf() --- Modified: src/modules/acc_radius/acc_radius_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/88b8ec8f2021fcc53289544102e5c50… Patch: https://github.com/kamailio/kamailio/commit/88b8ec8f2021fcc53289544102e5c50… --- diff --git a/src/modules/acc_radius/acc_radius_mod.c b/src/modules/acc_radius/acc_radius_mod.c index b4e74c6656..41e70c73fb 100644 --- a/src/modules/acc_radius/acc_radius_mod.c +++ b/src/modules/acc_radius/acc_radius_mod.c @@ -361,7 +361,7 @@ int acc_radius_send_request(struct sip_msg *req, acc_info_t *inf) tsecmicro = inf->env->tv.tv_sec + ((double)inf->env->tv.tv_usec / 1000000.0); //radius client doesn t support double so convert it - sprintf(smicrosec, "%17.6f", tsecmicro); + snprintf(smicrosec, 18, "%17.6f", tsecmicro); ADD_RAD_AVPAIR(RA_TIME_STAMP, &smicrosec, -1); } else { av_type = (uint32_t)inf->env->ts;

1 0

git:master:0666abf8: uac: use snprintf() instead of sprintf()
by Daniel-Constantin Mierla 18 Nov '19

18 Nov '19

Module: kamailio Branch: master Commit: 0666abf851bc5916b7700a30077ee954f695b862 URL: https://github.com/kamailio/kamailio/commit/0666abf851bc5916b7700a30077ee95… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-18T18:05:50+01:00 uac: use snprintf() instead of sprintf() --- Modified: src/modules/uac/replace.c --- Diff: https://github.com/kamailio/kamailio/commit/0666abf851bc5916b7700a30077ee95… Patch: https://github.com/kamailio/kamailio/commit/0666abf851bc5916b7700a30077ee95… --- diff --git a/src/modules/uac/replace.c b/src/modules/uac/replace.c index 8da8fc7441..0b489144a7 100644 --- a/src/modules/uac/replace.c +++ b/src/modules/uac/replace.c @@ -568,6 +568,7 @@ int restore_uri( struct sip_msg *msg, str *rr_param, str* restore_avp, int i; int_str avp_value; int flag; + int bsize; /* we should process only sequential request, but since we are looking * for Route param, the test is not really required -bogdan */ @@ -589,15 +590,20 @@ int restore_uri( struct sip_msg *msg, str *rr_param, str* restore_avp, goto failed; } - add_to_rr.s = pkg_malloc(3+rr_param->len+param_val.len); + bsize = 3+rr_param->len+param_val.len; + add_to_rr.s = pkg_malloc(bsize); if ( add_to_rr.s==0 ) { add_to_rr.len = 0; LM_ERR("no more pkg mem\n"); goto failed; } - add_to_rr.len = sprintf(add_to_rr.s, ";%.*s=%.*s", + add_to_rr.len = snprintf(add_to_rr.s, bsize, ";%.*s=%.*s", rr_param->len, rr_param->s, param_val.len, param_val.s); + if(add_to_rr.len<0 || add_to_rr.len>=bsize) { + LM_ERR("printing rr param failed\n"); + goto failed; + } if ( uac_rrb.add_rr_param(msg, &add_to_rr)!=0 ) { LM_ERR("add rr param failed\n"); goto failed;

1 0

git:master:8cb61c86: nat_traversal: use snprintf() instead of sprintf()
by Daniel-Constantin Mierla 18 Nov '19

18 Nov '19

Module: kamailio Branch: master Commit: 8cb61c86879802bf3f4eb5d60ee280d6003303c7 URL: https://github.com/kamailio/kamailio/commit/8cb61c86879802bf3f4eb5d60ee280d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-18T18:05:50+01:00 nat_traversal: use snprintf() instead of sprintf() --- Modified: src/modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/8cb61c86879802bf3f4eb5d60ee280d… Patch: https://github.com/kamailio/kamailio/commit/8cb61c86879802bf3f4eb5d60ee280d… --- diff --git a/src/modules/nat_traversal/nat_traversal.c b/src/modules/nat_traversal/nat_traversal.c index 3ccb6720ec..4ad12674db 100644 --- a/src/modules/nat_traversal/nat_traversal.c +++ b/src/modules/nat_traversal/nat_traversal.c @@ -1479,7 +1479,7 @@ static int FixContact(struct sip_msg *msg) struct lump *anchor; struct sip_uri uri; int len, offset; - char *buf; + str buf; if(!get_contact_uri(msg, &uri, &contact)) return -1; @@ -1506,8 +1506,8 @@ static int FixContact(struct sip_msg *msg) // first try to alloc mem. if we fail we don't want to have the lump // deleted and not replaced. at least this way we keep the original. - buf = pkg_malloc(len); - if(buf == NULL) { + buf.s = pkg_malloc(len); + if(buf.s == NULL) { LM_ERR("out of memory\n"); return -1; } @@ -1517,26 +1517,30 @@ static int FixContact(struct sip_msg *msg) msg, offset, contact->uri.len, (enum _hdr_types_t)HDR_CONTACT_F); if(!anchor) { - pkg_free(buf); + pkg_free(buf.s); return -1; } if(msg->rcv.src_ip.af == AF_INET6) { - len = sprintf(buf, "%.*s[%s]:%d%.*s", before_host.len, before_host.s, + buf.len = snprintf(buf.s, len, "%.*s[%s]:%d%.*s", before_host.len, before_host.s, newip.s, newport, after.len, after.s); } else { - len = sprintf(buf, "%.*s%s:%d%.*s", before_host.len, before_host.s, + buf.len = snprintf(buf.s, len, "%.*s%s:%d%.*s", before_host.len, before_host.s, newip.s, newport, after.len, after.s); } + if(buf.len < 0 || buf.len>=len) { + pkg_free(buf.s); + return -1; + } - if(insert_new_lump_after(anchor, buf, len, (enum _hdr_types_t)HDR_CONTACT_F) + if(insert_new_lump_after(anchor, buf.s, buf.len, (enum _hdr_types_t)HDR_CONTACT_F) == 0) { - pkg_free(buf); + pkg_free(buf.s); return -1; } - contact->uri.s = buf; - contact->uri.len = len; + contact->uri.s = buf.s; + contact->uri.len = buf.len; return 1; }

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
39
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2019