sr-dev September 2015

sr-dev@lists.kamailio.org

37 participants
387 discussions

git:4.2:f7800627: tsilo: Fix pointer comparison in ts_set_tm_callbacks

by grumvalski

Module: kamailio Branch: 4.2 Commit: f7800627e169c171992a596df28c746aab4f03bc URL: https://github.com/kamailio/kamailio/commit/f7800627e169c171992a596df28c746… Author: Chris Double <chris.double(a)double.co.nz> Committer: grumvalski <federico.cabiddu(a)gmail.com> Date: 2015-09-23T16:13:28+02:00 tsilo: Fix pointer comparison in ts_set_tm_callbacks - Fix cloned ts_transaction pointer comparison to check for NULL rather than less than zero. The latter doesn't make sense for an allocated pointer. (cherry picked from commit e304f9d8d4cc16a3b6cca1cdd10dff6d0a18d955) --- Modified: modules/tsilo/ts_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/f7800627e169c171992a596df28c746… Patch: https://github.com/kamailio/kamailio/commit/f7800627e169c171992a596df28c746… --- diff --git a/modules/tsilo/ts_handlers.c b/modules/tsilo/ts_handlers.c index 6a1828a..c04ec36 100644 --- a/modules/tsilo/ts_handlers.c +++ b/modules/tsilo/ts_handlers.c @@ -40,14 +40,11 @@ int ts_set_tm_callbacks(struct cell *t, sip_msg_t *req, ts_transaction_t *ts) if(t==NULL) return -1; - if ( (ts_clone=clone_ts_transaction(ts)) < 0 ) { + if ( (ts_clone=clone_ts_transaction(ts)) == NULL ) { LM_ERR("failed to clone transaction\n"); return -1; } - if (ts_clone == NULL) { - LM_ERR("transaction clone null\n"); - } if ( _tmb.register_tmcb( req, t,TMCB_DESTROY, ts_onreply, (void*)ts_clone, free_ts_transaction)<0 ) { LM_ERR("failed to register TMCB for transaction %d:%d\n", t->hash_index, t->label);

9 years, 2 months

git:4.2:0adb7dbf: tsilo: Call LM_DBG with correct transaction information

by grumvalski

Module: kamailio Branch: 4.2 Commit: 0adb7dbff65131d75e5195569af876ce713c9838 URL: https://github.com/kamailio/kamailio/commit/0adb7dbff65131d75e5195569af876c… Author: Chris Double <chris.double(a)double.co.nz> Committer: grumvalski <federico.cabiddu(a)gmail.com> Date: 2015-09-23T16:13:23+02:00 tsilo: Call LM_DBG with correct transaction information - Use cb_ptr in ts_onreply LM_DBG call as the ptr variable is NULL at that call point and cb_ptr contains the transaction information being looked for. (cherry picked from commit 03f6a49146980338d7e31aec60da551f8b6e7595) --- Modified: modules/tsilo/ts_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/0adb7dbff65131d75e5195569af876c… Patch: https://github.com/kamailio/kamailio/commit/0adb7dbff65131d75e5195569af876c… --- diff --git a/modules/tsilo/ts_handlers.c b/modules/tsilo/ts_handlers.c index 7cf7970..6a1828a 100644 --- a/modules/tsilo/ts_handlers.c +++ b/modules/tsilo/ts_handlers.c @@ -89,7 +89,7 @@ void ts_onreply(struct cell* t, int type, struct tmcb_params *param) } ptr = ptr->next; } - LM_DBG("transaction %u:%u not found\n",ptr->tindex, ptr->tlabel); + LM_DBG("transaction %u:%u not found\n",cb_ptr->tindex, cb_ptr->tlabel); unlock_entry(_e); } else { LM_DBG("called with uknown type %d\n", type);

9 years, 2 months

git:4.3:7ba20025: tsilo: Fix pointer comparison in ts_set_tm_callbacks

by grumvalski

Module: kamailio Branch: 4.3 Commit: 7ba20025b12bc6754778de72bbca58b01f9c4f7b URL: https://github.com/kamailio/kamailio/commit/7ba20025b12bc6754778de72bbca58b… Author: Chris Double <chris.double(a)double.co.nz> Committer: grumvalski <federico.cabiddu(a)gmail.com> Date: 2015-09-23T16:12:52+02:00 tsilo: Fix pointer comparison in ts_set_tm_callbacks - Fix cloned ts_transaction pointer comparison to check for NULL rather than less than zero. The latter doesn't make sense for an allocated pointer. (cherry picked from commit e304f9d8d4cc16a3b6cca1cdd10dff6d0a18d955) --- Modified: modules/tsilo/ts_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/7ba20025b12bc6754778de72bbca58b… Patch: https://github.com/kamailio/kamailio/commit/7ba20025b12bc6754778de72bbca58b… --- diff --git a/modules/tsilo/ts_handlers.c b/modules/tsilo/ts_handlers.c index 6a1828a..c04ec36 100644 --- a/modules/tsilo/ts_handlers.c +++ b/modules/tsilo/ts_handlers.c @@ -40,14 +40,11 @@ int ts_set_tm_callbacks(struct cell *t, sip_msg_t *req, ts_transaction_t *ts) if(t==NULL) return -1; - if ( (ts_clone=clone_ts_transaction(ts)) < 0 ) { + if ( (ts_clone=clone_ts_transaction(ts)) == NULL ) { LM_ERR("failed to clone transaction\n"); return -1; } - if (ts_clone == NULL) { - LM_ERR("transaction clone null\n"); - } if ( _tmb.register_tmcb( req, t,TMCB_DESTROY, ts_onreply, (void*)ts_clone, free_ts_transaction)<0 ) { LM_ERR("failed to register TMCB for transaction %d:%d\n", t->hash_index, t->label);

9 years, 2 months

git:4.3:0be54999: tsilo: Call LM_DBG with correct transaction information

by grumvalski

Module: kamailio Branch: 4.3 Commit: 0be54999fe5025cf42fa9d5506e588542c7ec2ed URL: https://github.com/kamailio/kamailio/commit/0be54999fe5025cf42fa9d5506e5885… Author: Chris Double <chris.double(a)double.co.nz> Committer: grumvalski <federico.cabiddu(a)gmail.com> Date: 2015-09-23T16:12:10+02:00 tsilo: Call LM_DBG with correct transaction information - Use cb_ptr in ts_onreply LM_DBG call as the ptr variable is NULL at that call point and cb_ptr contains the transaction information being looked for. (cherry picked from commit 03f6a49146980338d7e31aec60da551f8b6e7595) --- Modified: modules/tsilo/ts_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/0be54999fe5025cf42fa9d5506e5885… Patch: https://github.com/kamailio/kamailio/commit/0be54999fe5025cf42fa9d5506e5885… --- diff --git a/modules/tsilo/ts_handlers.c b/modules/tsilo/ts_handlers.c index 7cf7970..6a1828a 100644 --- a/modules/tsilo/ts_handlers.c +++ b/modules/tsilo/ts_handlers.c @@ -89,7 +89,7 @@ void ts_onreply(struct cell* t, int type, struct tmcb_params *param) } ptr = ptr->next; } - LM_DBG("transaction %u:%u not found\n",ptr->tindex, ptr->tlabel); + LM_DBG("transaction %u:%u not found\n",cb_ptr->tindex, cb_ptr->tlabel); unlock_entry(_e); } else { LM_DBG("called with uknown type %d\n", type);

9 years, 2 months

git:master:0049a20f: Merge pull request #340 from doublec/sqlops_memory_leak

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0049a20fe0bf1b755bfb61853e72b341099dc63d URL: https://github.com/kamailio/kamailio/commit/0049a20fe0bf1b755bfb61853e72b34… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-23T14:44:00+02:00 Merge pull request #340 from doublec/sqlops_memory_leak sqlops: Fix memory leak in error condition --- Modified: modules/sqlops/sql_var.c --- Diff: https://github.com/kamailio/kamailio/commit/0049a20fe0bf1b755bfb61853e72b34… Patch: https://github.com/kamailio/kamailio/commit/0049a20fe0bf1b755bfb61853e72b34… --- diff --git a/modules/sqlops/sql_var.c b/modules/sqlops/sql_var.c index f21140a..9b8721b 100644 --- a/modules/sqlops/sql_var.c +++ b/modules/sqlops/sql_var.c @@ -255,7 +255,9 @@ int pv_parse_dbr_name(pv_spec_p sp, str *in) if(p>in->s+in->len || *p=='\0' || *p!=']') goto error_index; } else { - LM_ERR("unknow key [%.*s]\n", pvs.len, pvs.s); + LM_ERR("unknown key [%.*s]\n", pvs.len, pvs.s); + if(spv!=NULL) + pkg_free(spv); return -1; } sp->pvp.pvn.u.dname = (void*)spv;

9 years, 2 months

git:master:48de7505: sqlops: Fix memory leak in error condition

by Chris Double

Module: kamailio Branch: master Commit: 48de750550dd12016e957d60e0ae57e59944558d URL: https://github.com/kamailio/kamailio/commit/48de750550dd12016e957d60e0ae57e… Author: Chris Double <chris.double(a)double.co.nz> Committer: Chris Double <chris.double(a)double.co.nz> Date: 2015-09-23T23:48:31+12:00 sqlops: Fix memory leak in error condition - Fix pv_parse_dbr_name to free spv if the key is unknown. - Fix typo in error log in pv_parse_dbr_name. --- Modified: modules/sqlops/sql_var.c --- Diff: https://github.com/kamailio/kamailio/commit/48de750550dd12016e957d60e0ae57e… Patch: https://github.com/kamailio/kamailio/commit/48de750550dd12016e957d60e0ae57e… --- diff --git a/modules/sqlops/sql_var.c b/modules/sqlops/sql_var.c index 940ec5a..20ec672 100644 --- a/modules/sqlops/sql_var.c +++ b/modules/sqlops/sql_var.c @@ -257,7 +257,9 @@ int pv_parse_dbr_name(pv_spec_p sp, str *in) if(p>in->s+in->len || *p=='\0' || *p!=']') goto error_index; } else { - LM_ERR("unknow key [%.*s]\n", pvs.len, pvs.s); + LM_ERR("unknown key [%.*s]\n", pvs.len, pvs.s); + if(spv!=NULL) + pkg_free(spv); return -1; } sp->pvp.pvn.u.dname = (void*)spv;

9 years, 2 months

[kamailio] sqlops: Fix memory leak in error condition (#340)

by Chris Double

- Fix pv_parse_dbr_name to free spv if the key is unknown. - Fix typo in error log in pv_parse_dbr_name. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/340 -- Commit Summary -- * sqlops: Fix memory leak in error condition -- File Changes -- M modules/sqlops/sql_var.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/340.patch https://github.com/kamailio/kamailio/pull/340.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/340

9 years, 2 months

git:master:2316b90f: Merge pull request #339 from doublec/sqlops_bad_free

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2316b90fc22ab8b020d26b9c928f6e6e0fd0a885 URL: https://github.com/kamailio/kamailio/commit/2316b90fc22ab8b020d26b9c928f6e6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-23T14:43:06+02:00 Merge pull request #339 from doublec/sqlops_bad_free sqlops: Don't pkg_free memory that wasn't pkg_malloc'd --- Modified: modules/sqlops/sql_var.c --- Diff: https://github.com/kamailio/kamailio/commit/2316b90fc22ab8b020d26b9c928f6e6… Patch: https://github.com/kamailio/kamailio/commit/2316b90fc22ab8b020d26b9c928f6e6… --- diff --git a/modules/sqlops/sql_var.c b/modules/sqlops/sql_var.c index 940ec5a..f21140a 100644 --- a/modules/sqlops/sql_var.c +++ b/modules/sqlops/sql_var.c @@ -104,7 +104,6 @@ int sql_parse_index(str *in, gparam_t *gp) if (gp->v.pvs == NULL) { LM_ERR("no pkg memory left for pv_spec_t\n"); - pkg_free(gp); return -1; } @@ -112,7 +111,6 @@ int sql_parse_index(str *in, gparam_t *gp) { LM_ERR("invalid PV identifier\n"); pkg_free(gp->v.pvs); - pkg_free(gp); return -1; } } else {

9 years, 2 months

git:master:460e0a60: sqlops: Don't pkg_free memory that wasn't pkg_malloc'd

by Chris Double

Module: kamailio Branch: master Commit: 460e0a6077d69cf74ceb4b095195b683fb49269c URL: https://github.com/kamailio/kamailio/commit/460e0a6077d69cf74ceb4b095195b68… Author: Chris Double <chris.double(a)double.co.nz> Committer: Chris Double <chris.double(a)double.co.nz> Date: 2015-09-23T22:17:21+12:00 sqlops: Don't pkg_free memory that wasn't pkg_malloc'd - Don't pkg_free the gparam_t parameter of sql_parse_index. When called within pv_parse_dbr_name that parameter is an internal field in the sql_pv_t structure and wasn't allocated with pkg_malloc. --- Modified: modules/sqlops/sql_var.c --- Diff: https://github.com/kamailio/kamailio/commit/460e0a6077d69cf74ceb4b095195b68… Patch: https://github.com/kamailio/kamailio/commit/460e0a6077d69cf74ceb4b095195b68… --- diff --git a/modules/sqlops/sql_var.c b/modules/sqlops/sql_var.c index 940ec5a..f21140a 100644 --- a/modules/sqlops/sql_var.c +++ b/modules/sqlops/sql_var.c @@ -104,7 +104,6 @@ int sql_parse_index(str *in, gparam_t *gp) if (gp->v.pvs == NULL) { LM_ERR("no pkg memory left for pv_spec_t\n"); - pkg_free(gp); return -1; } @@ -112,7 +111,6 @@ int sql_parse_index(str *in, gparam_t *gp) { LM_ERR("invalid PV identifier\n"); pkg_free(gp->v.pvs); - pkg_free(gp); return -1; } } else {

9 years, 2 months

[kamailio] sqlops: Don't pkg_free memory that wasn't pkg_malloc'd (#339)

by Chris Double

- Don't pkg_free the gparam_t parameter of sql_parse_index. When called within pv_parse_dbr_name that parameter is an internal field in the sql_pv_t structure and wasn't allocated with pkg_malloc. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/339 -- Commit Summary -- * sqlops: Don't pkg_free memory that wasn't pkg_malloc'd -- File Changes -- M modules/sqlops/sql_var.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/339.patch https://github.com/kamailio/kamailio/pull/339.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/339

9 years, 2 months

← Newer
1
...
6
7
8
9
10
11
12
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2015