sr-dev May 2015

sr-dev@lists.kamailio.org

34 participants
297 discussions

git:4.2:53dbdd38: sipcapture: fix not to access freed pointer during shut down

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.2 Commit: 53dbdd384670e384c714739224e3c38366a23b3f URL: https://github.com/kamailio/kamailio/commit/53dbdd384670e384c714739224e3c38… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-19T09:35:48+02:00 sipcapture: fix not to access freed pointer during shut down (cherry picked from commit 1db6fdf41dbb4b6c95e0f86dfebc4c793858d8b5) --- Modified: modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/53dbdd384670e384c714739224e3c38… Patch: https://github.com/kamailio/kamailio/commit/53dbdd384670e384c714739224e3c38… --- diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c index 070482c..804436e 100644 --- a/modules/sipcapture/sipcapture.c +++ b/modules/sipcapture/sipcapture.c @@ -1028,7 +1028,7 @@ static void destroy(void) c = capture_modes_root; while (c){ - c0 = c; + c0 = c->next; if (c->name.s){ pkg_free(c->name.s); } @@ -1043,7 +1043,7 @@ static void destroy(void) } pkg_free(c); - c = c0->next; + c = c0; } if (capture_on_flag)

9 years, 6 months

git:4.2:cd42ec08: core: safety check for linker when inserting xavp with index

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.2 Commit: cd42ec08027349be350b40e78bb5fff98ed32527 URL: https://github.com/kamailio/kamailio/commit/cd42ec08027349be350b40e78bb5fff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-19T09:35:33+02:00 core: safety check for linker when inserting xavp with index (cherry picked from commit ec438b45696e17af0a3b19bb7ac12b221f897517) --- Modified: xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/cd42ec08027349be350b40e78bb5fff… Patch: https://github.com/kamailio/kamailio/commit/cd42ec08027349be350b40e78bb5fff… --- diff --git a/xavp.c b/xavp.c index f7cb360..3d12f49 100644 --- a/xavp.c +++ b/xavp.c @@ -733,6 +733,10 @@ int xavp_insert(sr_xavp_t *xavp, int idx, sr_xavp_t **list) lst = crt; } + if(lst==NULL) { + LM_ERR("cannot link the xavp\n"); + return -1; + } xavp->next = lst->next; lst->next = xavp;

9 years, 6 months

git:4.2:b8268aff: regex: replaced allocated memory initialization with a for loop to one memset

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.2 Commit: b8268aff60a023bfcd188f4c2e57fb3ba9b00138 URL: https://github.com/kamailio/kamailio/commit/b8268aff60a023bfcd188f4c2e57fb3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-19T09:35:25+02:00 regex: replaced allocated memory initialization with a for loop to one memset (cherry picked from commit abdc02f1cb26c71b4118044d8c45dec728992e15) --- Modified: modules/regex/regex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b8268aff60a023bfcd188f4c2e57fb3… Patch: https://github.com/kamailio/kamailio/commit/b8268aff60a023bfcd188f4c2e57fb3… --- diff --git a/modules/regex/regex_mod.c b/modules/regex/regex_mod.c index 4f714b5..adc0de9 100644 --- a/modules/regex/regex_mod.c +++ b/modules/regex/regex_mod.c @@ -281,9 +281,8 @@ static int load_pcres(int action) fclose(f); goto err; } - for (i=0; i<max_groups; i++) { - patterns[i] = NULL; - } + memset(patterns, 0, sizeof(char*) * max_groups); + for (i=0; i<max_groups; i++) { if ((patterns[i] = pkg_malloc(sizeof(char) * group_max_size)) == 0) { LM_ERR("no more memory for patterns[%d]\n", i);

9 years, 6 months

git:4.2:723f170b: rr: reset lump pointer to avoid using it after free for remove rr function

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.2 Commit: 723f170b882d98a6100ccfb931447d7630f57bde URL: https://github.com/kamailio/kamailio/commit/723f170b882d98a6100ccfb931447d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-19T09:35:06+02:00 rr: reset lump pointer to avoid using it after free for remove rr function (cherry picked from commit f03c86ade6af9bc529a52f7fd50004721278ae19) --- Modified: modules/rr/rr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/723f170b882d98a6100ccfb931447d7… Patch: https://github.com/kamailio/kamailio/commit/723f170b882d98a6100ccfb931447d7… --- diff --git a/modules/rr/rr_mod.c b/modules/rr/rr_mod.c index 34aa0a6..c01de65 100644 --- a/modules/rr/rr_mod.c +++ b/modules/rr/rr_mod.c @@ -445,13 +445,11 @@ static void free_rr_lump(struct lump **list) are in failure_route. -- No problem, only the anchor is left in the list */ - LOG(L_DBG, "DEBUG: free_rr_lump: lump %p" \ - " is left in the list\n", + LM_DBG("lump %p is left in the list\n", lump); if (lump->len) - LOG(L_CRIT, "BUG: free_rr_lump: lump %p" \ - " can not be removed, but len=%d\n", + LM_CRIT("lump %p can not be removed, but len=%d\n", lump, lump->len); prev_lump=lump; @@ -460,14 +458,16 @@ static void free_rr_lump(struct lump **list) else *list = lump->next; if (!(lump->flags&(LUMPFLAG_DUPED|LUMPFLAG_SHMEM))) free_lump(lump); - if (!(lump->flags&LUMPFLAG_SHMEM)) + if (!(lump->flags&LUMPFLAG_SHMEM)) { pkg_free(lump); + lump = 0; + } } } else { /* store previous position */ prev_lump=lump; } - if (first_shmem && (lump->flags&LUMPFLAG_SHMEM)) + if (first_shmem && lump && (lump->flags&LUMPFLAG_SHMEM)) first_shmem=0; } }

9 years, 6 months

git:4.2:fd6dba3b: regex: safety to check to avoid working with zero size allocations

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.2 Commit: fd6dba3b9752e9cbf21da2ca7b66b2e5c1dafce7 URL: https://github.com/kamailio/kamailio/commit/fd6dba3b9752e9cbf21da2ca7b66b2e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-19T09:34:50+02:00 regex: safety to check to avoid working with zero size allocations (cherry picked from commit 5e5866b2ac8390caa9373f49345ed877c6e5f037) --- Modified: modules/regex/regex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/fd6dba3b9752e9cbf21da2ca7b66b2e… Patch: https://github.com/kamailio/kamailio/commit/fd6dba3b9752e9cbf21da2ca7b66b2e… --- diff --git a/modules/regex/regex_mod.c b/modules/regex/regex_mod.c index 5b8b5cc..4f714b5 100644 --- a/modules/regex/regex_mod.c +++ b/modules/regex/regex_mod.c @@ -354,6 +354,11 @@ static int load_pcres(int action) fclose(f); + if(num_pcres_tmp==0) { + LM_ERR("no expressions in the file\n"); + goto err; + } + /* Fix the patterns */ for (i=0; i < num_pcres_tmp; i++) {

9 years, 6 months

git:4.2:e7101281: textops: safety check to know there is a string to add via lump

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.2 Commit: e71012814800462519b9040e82c892dfa39bf817 URL: https://github.com/kamailio/kamailio/commit/e71012814800462519b9040e82c892d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-19T09:34:36+02:00 textops: safety check to know there is a string to add via lump (cherry picked from commit ca220afe0f738f2353d16c96dd16ab279ffdcf74) --- Modified: modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/e71012814800462519b9040e82c892d… Patch: https://github.com/kamailio/kamailio/commit/e71012814800462519b9040e82c892d… --- diff --git a/modules/textops/textops.c b/modules/textops/textops.c index a945937..fa8874f 100644 --- a/modules/textops/textops.c +++ b/modules/textops/textops.c @@ -2126,6 +2126,11 @@ int add_hf_helper(struct sip_msg* msg, str *str1, str *str2, len=s0.len; if (str2) len+= str2->len + REQ_LINE(msg).uri.len; + if(len==0) { + LM_INFO("nothing to add\n"); + return -1; + } + s = (char*)pkg_malloc(len); if (!s) { LM_ERR("no pkg memory left\n");

9 years, 6 months

git:4.2:3fd7f816: tm: safety check not to allocate 0 bytes in rpc command

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.2 Commit: 3fd7f816607acbc80ed49b5743dd55870d6b1e92 URL: https://github.com/kamailio/kamailio/commit/3fd7f816607acbc80ed49b5743dd558… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-19T09:30:31+02:00 tm: safety check not to allocate 0 bytes in rpc command (cherry picked from commit 88b67575f9457312d0277e16dc06103be3a31965) --- Modified: modules/tm/rpc_uac.c --- Diff: https://github.com/kamailio/kamailio/commit/3fd7f816607acbc80ed49b5743dd558… Patch: https://github.com/kamailio/kamailio/commit/3fd7f816607acbc80ed49b5743dd558… --- diff --git a/modules/tm/rpc_uac.c b/modules/tm/rpc_uac.c index 507f4ae..db692ef 100644 --- a/modules/tm/rpc_uac.c +++ b/modules/tm/rpc_uac.c @@ -218,7 +218,12 @@ static char *get_hfblock(str *uri, struct hdr_field *hf, int proto, DBG("get_hfblock: one more hf processed\n"); } /* header loop */ - /* construct a single header block now */ + if(total_len==0) { + LM_DBG("empty result for headers block\n"); + goto error; + } + + /* construct a single header block now */ ret = pkg_malloc(total_len); if (!ret) { LOG(L_ERR, "get_hfblock: no pkg mem for hf block\n");

9 years, 6 months

git:4.2:7cb9428e: tmx: check for empty result not to allocate 0 bytes

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.2 Commit: 7cb9428ec3785e42b95eb2cc30cb4ac8503e760d URL: https://github.com/kamailio/kamailio/commit/7cb9428ec3785e42b95eb2cc30cb4ac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-19T09:29:59+02:00 tmx: check for empty result not to allocate 0 bytes - allocation of 0 size is undefined when using system malloc (cherry picked from commit 0db313f0047fc512dec2976cac168989b60d49c8) --- Modified: modules/tmx/t_mi.c --- Diff: https://github.com/kamailio/kamailio/commit/7cb9428ec3785e42b95eb2cc30cb4ac… Patch: https://github.com/kamailio/kamailio/commit/7cb9428ec3785e42b95eb2cc30cb4ac… --- diff --git a/modules/tmx/t_mi.c b/modules/tmx/t_mi.c index 97123f7..e3bff25 100644 --- a/modules/tmx/t_mi.c +++ b/modules/tmx/t_mi.c @@ -233,6 +233,10 @@ static inline char *get_hfblock( str *uri, struct hdr_field *hf, int *l, struct LM_DBG("one more hf processed\n"); } /* header loop */ + if(total_len==0) { + LM_DBG("empty result\n"); + goto error; + } /* construct a single header block now */ ret=pkg_malloc(total_len);

9 years, 6 months

git:4.2:c468ed26: presence_xml: better error handling to free all allocated vars

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.2 Commit: c468ed26732022f532080dffc8c9f8aaf854ef2f URL: https://github.com/kamailio/kamailio/commit/c468ed26732022f532080dffc8c9f8a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-19T09:29:44+02:00 presence_xml: better error handling to free all allocated vars (cherry picked from commit 2d40e14d2b0b150acd34ac2d1df25936d8faaca9) --- Modified: modules/presence_xml/pres_check.c --- Diff: https://github.com/kamailio/kamailio/commit/c468ed26732022f532080dffc8c9f8a… Patch: https://github.com/kamailio/kamailio/commit/c468ed26732022f532080dffc8c9f8a… --- diff --git a/modules/presence_xml/pres_check.c b/modules/presence_xml/pres_check.c index 4504048..8f45c0f 100644 --- a/modules/presence_xml/pres_check.c +++ b/modules/presence_xml/pres_check.c @@ -140,7 +140,7 @@ int presxml_check_activities(struct sip_msg *msg, str presentity_uri, str activi if (presentity == NULL || presentity->len <= 0 || presentity->s == NULL) { LM_DBG("cannot get presentity for %.*s\n", presentity_uri.len, presentity_uri.s); - return -1; + goto error; } if ((xmlDoc = xmlParseMemory(presentity->s, presentity->len)) == NULL) @@ -192,6 +192,7 @@ int presxml_check_activities(struct sip_msg *msg, str presentity_uri, str activi pkg_free(nodeName); if (xmlDoc != NULL) xmlFreeDoc(xmlDoc); - pres_free_presentity(presentity, ev); + if(presentity != NULL) + pres_free_presentity(presentity, ev); return retval; }

9 years, 6 months

git:4.2:8f324fb6: pua: mark that tupple was allocated so can be freed in case of errors

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.2 Commit: 8f324fb6b3955ea6d5d4e57ec022d400f2c4e124 URL: https://github.com/kamailio/kamailio/commit/8f324fb6b3955ea6d5d4e57ec022d40… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-19T09:29:35+02:00 pua: mark that tupple was allocated so can be freed in case of errors (cherry picked from commit 1b20aa04048d15d0861b3f5291fd3b9a1614fdf5) --- Modified: modules/pua/add_events.c --- Diff: https://github.com/kamailio/kamailio/commit/8f324fb6b3955ea6d5d4e57ec022d40… Patch: https://github.com/kamailio/kamailio/commit/8f324fb6b3955ea6d5d4e57ec022d40… --- diff --git a/modules/pua/add_events.c b/modules/pua/add_events.c index f8ef09c..d48ea5f 100644 --- a/modules/pua/add_events.c +++ b/modules/pua/add_events.c @@ -197,6 +197,7 @@ int pres_process_body(publ_info_t* publ, str** fin_body, int ver, str** tuple_pa LM_ERR("No more memory\n"); goto error; } + alloc_tuple= 1; tuple->s= (char*)pkg_malloc(tuple_id_len* sizeof(char)); if(tuple->s== NULL) { @@ -206,7 +207,6 @@ int pres_process_body(publ_info_t* publ, str** fin_body, int ver, str** tuple_pa memcpy(tuple->s, tuple_id, tuple_id_len); tuple->len= tuple_id_len; *tuple_param= tuple; - alloc_tuple= 1; } }

9 years, 6 months

← Newer
1
...
13
14
15
16
17
18
19
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2015