sr-dev

sr-dev@lists.kamailio.org

22 participants
45186 discussions

git:master:b9de5009: benchmark: fix order of free operation
by Henning Westerholt 22 Mar '23

22 Mar '23

Module: kamailio Branch: master Commit: b9de5009f81e27934a2108c06eae27ea748ead37 URL: https://github.com/kamailio/kamailio/commit/b9de5009f81e27934a2108c06eae27e… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-22T12:58:56Z benchmark: fix order of free operation --- Modified: src/modules/benchmark/benchmark.c --- Diff: https://github.com/kamailio/kamailio/commit/b9de5009f81e27934a2108c06eae27e… Patch: https://github.com/kamailio/kamailio/commit/b9de5009f81e27934a2108c06eae27e… --- diff --git a/src/modules/benchmark/benchmark.c b/src/modules/benchmark/benchmark.c index 09af04abf8..08e7c1ccc4 100644 --- a/src/modules/benchmark/benchmark.c +++ b/src/modules/benchmark/benchmark.c @@ -443,8 +443,8 @@ int _bm_register_timer(char *tname, int mode, unsigned int *id) if(bm_mycfg->tindex==0) { SHM_MEM_ERROR; - shm_free(bmt); pkg_free(bmt->start); + shm_free(bmt); if(tidx!=0) shm_free(tidx); return -1;

1 0

Re: [kamailio/kamailio] benchmark: properly free previous allocated memory in case of error (d7770ca)
by Victor Seva 22 Mar '23

22 Mar '23

@henningw this is wrong no? it should be ``` pkg_free(bmt->start); shm_free(bmt); ``` instead. you can't access ``bmt->start`` if you freed ``bmt`` first, no? -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/d7770cae2ee68be7184298b2bb41cb0… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/d7770cae2ee68be7184298b2bb41cb0ba3ebb47d/105547932(a)github.com>

2 1

Re: [kamailio/kamailio] app_sqlang: convert to memory logging helper (0702a7e)
by Daniel-Constantin Mierla 22 Mar '23

22 Mar '23

In the above case, `SHM_MEM_ERROR` is losing the usefulness of the previous version of the log message, there is `SHM_MEM_ERROR_FMT` that should be used. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/0702a7e0d9df2867cbc86188c06d953… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/0702a7e0d9df2867cbc86188c06d95363d484d5a/105546658(a)github.com>

2 1

git:master:43751e7b: app_sqlang: restore some details related to one memory error log
by Henning Westerholt 22 Mar '23

22 Mar '23

Module: kamailio Branch: master Commit: 43751e7b0071135d433258cc0423cc00546a31e6 URL: https://github.com/kamailio/kamailio/commit/43751e7b0071135d433258cc0423cc0… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-22T12:52:09Z app_sqlang: restore some details related to one memory error log --- Modified: src/modules/app_sqlang/app_sqlang_api.c --- Diff: https://github.com/kamailio/kamailio/commit/43751e7b0071135d433258cc0423cc0… Patch: https://github.com/kamailio/kamailio/commit/43751e7b0071135d433258cc0423cc0… --- diff --git a/src/modules/app_sqlang/app_sqlang_api.c b/src/modules/app_sqlang/app_sqlang_api.c index fd2a81f759b..d0df44cb63d 100644 --- a/src/modules/app_sqlang/app_sqlang_api.c +++ b/src/modules/app_sqlang/app_sqlang_api.c @@ -583,7 +583,7 @@ int sqlang_sr_init_mod(void) if(_sr_sqlang_reload_version == NULL) { _sr_sqlang_reload_version = (int*)shm_malloc(sizeof(int)); if(_sr_sqlang_reload_version == NULL) { - SHM_MEM_ERROR; + SHM_MEM_ERROR_FMT("reload version\n");; return -1; } *_sr_sqlang_reload_version = 0;

1 0

Re: [kamailio/kamailio] auth_db: fix goto for memory allocation error, convert to memory logging helper (01e82b3)
by Daniel-Constantin Mierla 22 Mar '23

22 Mar '23

Probably the `parse_error` label should be replaced by `error` and all `goto`'s point to it. `parse_error` is used for other cases like target pv not being writeable, it's difference comparing with `error` is printing more context info about the position in the string where the error happens. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/01e82b38c41d344c1e94b2e0f574981… You are receiving this because you commented. Message ID: <kamailio/kamailio/commit/01e82b38c41d344c1e94b2e0f574981ef0ce4318/105547846(a)github.com>

1 0

git:master:7378aa0f: cfgutils: convert to memory error logging helper, add missing free in error case
by Henning Westerholt 22 Mar '23

22 Mar '23

Module: kamailio Branch: master Commit: 7378aa0f7dcbde237bb5701f40b8a2d008d78b45 URL: https://github.com/kamailio/kamailio/commit/7378aa0f7dcbde237bb5701f40b8a2d… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-22T12:15:35Z cfgutils: convert to memory error logging helper, add missing free in error case --- Modified: src/modules/cfgutils/cfgutils.c --- Diff: https://github.com/kamailio/kamailio/commit/7378aa0f7dcbde237bb5701f40b8a2d… Patch: https://github.com/kamailio/kamailio/commit/7378aa0f7dcbde237bb5701f40b8a2d… --- diff --git a/src/modules/cfgutils/cfgutils.c b/src/modules/cfgutils/cfgutils.c index 9a77b40aed8..bf4b0680bbc 100644 --- a/src/modules/cfgutils/cfgutils.c +++ b/src/modules/cfgutils/cfgutils.c @@ -884,14 +884,15 @@ static int mod_init(void) probability=(int *) shm_malloc(sizeof(int)); if (!probability) { - LM_ERR("no shmem available\n"); + SHM_MEM_ERROR; return -1; } *probability = initial_prob; gflags=(unsigned int *) shm_malloc(sizeof(unsigned int)); if (!gflags) { - LM_ERR(" no shmem available\n"); + SHM_MEM_ERROR; + shm_free(probability); return -1; } *gflags=initial_gflags;

1 0

git:master:d7770cae: benchmark: properly free previous allocated memory in case of error
by Henning Westerholt 22 Mar '23

22 Mar '23

Module: kamailio Branch: master Commit: d7770cae2ee68be7184298b2bb41cb0ba3ebb47d URL: https://github.com/kamailio/kamailio/commit/d7770cae2ee68be7184298b2bb41cb0… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-22T11:20:08Z benchmark: properly free previous allocated memory in case of error --- Modified: src/modules/benchmark/benchmark.c --- Diff: https://github.com/kamailio/kamailio/commit/d7770cae2ee68be7184298b2bb41cb0… Patch: https://github.com/kamailio/kamailio/commit/d7770cae2ee68be7184298b2bb41cb0… --- diff --git a/src/modules/benchmark/benchmark.c b/src/modules/benchmark/benchmark.c index cb1e288be16..09af04abf88 100644 --- a/src/modules/benchmark/benchmark.c +++ b/src/modules/benchmark/benchmark.c @@ -443,6 +443,8 @@ int _bm_register_timer(char *tname, int mode, unsigned int *id) if(bm_mycfg->tindex==0) { SHM_MEM_ERROR; + shm_free(bmt); + pkg_free(bmt->start); if(tidx!=0) shm_free(tidx); return -1;

1 0

git:master:af9f95da: cplc: convert to memory error logging helper, add one missing free in error case
by Henning Westerholt 22 Mar '23

22 Mar '23

Module: kamailio Branch: master Commit: af9f95da42bd07ea9bf3de0ea5cbd264f384bc02 URL: https://github.com/kamailio/kamailio/commit/af9f95da42bd07ea9bf3de0ea5cbd26… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-22T12:13:47Z cplc: convert to memory error logging helper, add one missing free in error case --- Modified: src/modules/cplc/cpl_db.c Modified: src/modules/cplc/cpl_loader.c Modified: src/modules/cplc/cpl_log.c Modified: src/modules/cplc/cpl_nonsig.c Modified: src/modules/cplc/cpl_proxy.h Modified: src/modules/cplc/cpl_run.c Modified: src/modules/cplc/cpl_time.c Modified: src/modules/cplc/cplc.c Modified: src/modules/cplc/loc_set.h Modified: src/modules/cplc/sub_list.c --- Diff: https://github.com/kamailio/kamailio/commit/af9f95da42bd07ea9bf3de0ea5cbd26… Patch: https://github.com/kamailio/kamailio/commit/af9f95da42bd07ea9bf3de0ea5cbd26…

1 0

git:master:9e001534: avpops: convert to memory error logging helper
by Henning Westerholt 22 Mar '23

22 Mar '23

Module: kamailio Branch: master Commit: 9e001534589a3428cd5f8908e84fe327ffc20fb6 URL: https://github.com/kamailio/kamailio/commit/9e001534589a3428cd5f8908e84fe32… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-22T11:17:22Z avpops: convert to memory error logging helper --- Modified: src/modules/avpops/avpops.c Modified: src/modules/avpops/avpops_db.c Modified: src/modules/avpops/avpops_parse.c --- Diff: https://github.com/kamailio/kamailio/commit/9e001534589a3428cd5f8908e84fe32… Patch: https://github.com/kamailio/kamailio/commit/9e001534589a3428cd5f8908e84fe32…

1 0

Re: [kamailio/kamailio] auth_db: fix goto for memory allocation error, convert to memory logging helper (01e82b3)
by Bastian Triller 22 Mar '23

22 Mar '23

Is it intended to jump to `error` instead of `parse_error` now? @pantelisk98 @henningw -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/01e82b38c41d344c1e94b2e0f574981… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/01e82b38c41d344c1e94b2e0f574981ef0ce4318/105530322(a)github.com>

2 1

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev