sr-dev January 2011

sr-dev@lists.kamailio.org

14 participants
226 discussions

git:3.1: pdt(k): don't safety check the db con in child init
by Daniel-Constantin Mierla 15 Jan '11

15 Jan '11

Module: sip-router Branch: 3.1 Commit: 8aafb847ed046848b6713785ff4fb59070a0467e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8aafb84… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Jan 15 12:25:45 2011 +0100 pdt(k): don't safety check the db con in child init - proper db connection is returned based on pid condition (cherry picked from commit 6da5a7a363590b4830d841125cb7e354ec376d10) --- modules_k/pdt/pdt.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/modules_k/pdt/pdt.c b/modules_k/pdt/pdt.c index a5eeed4..cfc3930 100644 --- a/modules_k/pdt/pdt.c +++ b/modules_k/pdt/pdt.c @@ -275,10 +275,7 @@ error1: */ static int mi_child_init(void) { - /* check if db handler is initialized */ - if(db_con!=NULL) - return 0; - + /* db handler initialization */ db_con = pdt_dbf.init(&db_url); if(db_con==NULL) {

1 0

git:master: dispatcher(k): don't safety check db con in child init
by Daniel-Constantin Mierla 15 Jan '11

15 Jan '11

Module: sip-router Branch: master Commit: 0fa5e3acc651c7659fb0d55f03f0d23aade1dad1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0fa5e3a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Jan 15 12:34:11 2011 +0100 dispatcher(k): don't safety check db con in child init - proper db connection is returned based on pid condition --- modules_k/dispatcher/dispatch.c | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) diff --git a/modules_k/dispatcher/dispatch.c b/modules_k/dispatcher/dispatch.c index e42f5d8..19b5fab 100644 --- a/modules_k/dispatcher/dispatch.c +++ b/modules_k/dispatcher/dispatch.c @@ -627,19 +627,13 @@ error: */ int ds_connect_db(void) { - if(!ds_db_url.s) + if(ds_db_url.s==NULL) return -1; - if (ds_db_handle) - { - LM_CRIT("BUG - db connection found already open\n"); + if((ds_db_handle = ds_dbf.init(&ds_db_url)) == 0) { + LM_ERR("cannot initialize db connection\n"); return -1; } - - if ((ds_db_handle = ds_dbf.init(&ds_db_url)) == 0){ - - return -1; - } return 0; }

1 0

git:master: pdt(k): don't safety check the db con in child init
by Daniel-Constantin Mierla 15 Jan '11

15 Jan '11

Module: sip-router Branch: master Commit: 6da5a7a363590b4830d841125cb7e354ec376d10 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6da5a7a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Jan 15 12:25:45 2011 +0100 pdt(k): don't safety check the db con in child init - proper db connection is returned based on pid condition --- modules_k/pdt/pdt.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/modules_k/pdt/pdt.c b/modules_k/pdt/pdt.c index a5eeed4..cfc3930 100644 --- a/modules_k/pdt/pdt.c +++ b/modules_k/pdt/pdt.c @@ -275,10 +275,7 @@ error1: */ static int mi_child_init(void) { - /* check if db handler is initialized */ - if(db_con!=NULL) - return 0; - + /* db handler initialization */ db_con = pdt_dbf.init(&db_url); if(db_con==NULL) {

1 0

git:master: mtree: don't safety check for db con in mod child
by Daniel-Constantin Mierla 15 Jan '11

15 Jan '11

Module: sip-router Branch: master Commit: 11b19d2f5f471bd151bfc47e82f716526118e834 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=11b19d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Jan 15 12:22:45 2011 +0100 mtree: don't safety check for db con in mod child - proper connection will be returned based on pid condition --- modules/mtree/mtree_mod.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/modules/mtree/mtree_mod.c b/modules/mtree/mtree_mod.c index 29ea12a..40ad09b 100644 --- a/modules/mtree/mtree_mod.c +++ b/modules/mtree/mtree_mod.c @@ -327,8 +327,6 @@ error1: */ static int mi_child_init(void) { - if(db_con!=NULL) - return 0; db_con = mt_dbf.init(&db_url); if(db_con==NULL) {

1 0

git:master: modules_k/usrloc If path is Null, prevent memcpy on it in get_all_ucontact(mode DB_ONLY)
by Marius Zbihlei 14 Jan '11

14 Jan '11

Module: sip-router Branch: master Commit: 5b2881b694510bcca94d1bfbf9c08ea49478b989 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5b2881b… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Fri Jan 14 17:47:32 2011 +0200 modules_k/usrloc If path is Null, prevent memcpy on it in get_all_ucontact(mode DB_ONLY) --- modules_k/usrloc/dlist.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules_k/usrloc/dlist.c b/modules_k/usrloc/dlist.c index 8c739d4..6399fad 100644 --- a/modules_k/usrloc/dlist.c +++ b/modules_k/usrloc/dlist.c @@ -223,8 +223,11 @@ static inline int get_all_db_ucontacts(void *buf, int len, unsigned int flags, /* write path */ memcpy(cp, &p1_len, sizeof(p1_len)); cp = (char*)cp + sizeof(p1_len); - memcpy(cp, p1, p1_len); - cp = (char*)cp + p1_len; + /* copy path only if exist */ + if(p1_len){ + memcpy(cp, p1, p1_len); + cp = (char*)cp + p1_len; + } len -= needed; } /* row cycle */

1 0

git:master: core:modparam. c In case of a STRING type to STR type convertion, garbage was written
by Marius Zbihlei 14 Jan '11

14 Jan '11

Module: sip-router Branch: master Commit: 97727e803ec765aff15355dce116454d72cd2323 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=97727e8… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Fri Jan 14 17:52:52 2011 +0200 core:modparam.c In case of a STRING type to STR type convertion, garbage was written The local "s" var was never written, a line was missing. --- modparam.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modparam.c b/modparam.c index ffc3125..8661b90 100644 --- a/modparam.c +++ b/modparam.c @@ -104,6 +104,7 @@ int set_mod_param_regex(char* regex, char* name, modparam_t type, void* val) s.len = s.s ? strlen(s.s) : 0; val2 = &s; } else if (type == PARAM_STR && PARAM_TYPE_MASK(param_type) == PARAM_STRING) { + s = *(str*)val; val2 = s.s; /* zero terminator expected */ } else { val2 = val;

1 0

git:master: core: In case of OOM, prevent crash
by Marius Zbihlei 14 Jan '11

14 Jan '11

Module: sip-router Branch: master Commit: 2453a41d48656a442c7431ceb70570fee9c2bc75 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2453a41… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Fri Jan 14 17:30:32 2011 +0200 core: In case of OOM, prevent crash --- ut.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ut.c b/ut.c index 275381c..b011fda 100644 --- a/ut.c +++ b/ut.c @@ -243,6 +243,7 @@ char* get_abs_pathname(str* base, str* file) * copy and use it as it is */ if ((res = pkg_malloc(file->len+1)) == NULL) { ERR("get_abs_pathname: No memory left (pkg_malloc failed)\n"); + return NULL; } memcpy(res, file->s, file->len); res[file->len]=0;

1 0

git:master: modules_l/presence/notify.c fixed null pointer bug
by Marius Ovidiu Bucur 14 Jan '11

14 Jan '11

Module: sip-router Branch: master Commit: 058c7ead662c87834edf39de2ffa4e386cc78cd4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=058c7ea… Author: Marius Bucur <marius.bucur(a)1and1.ro> Committer: Marius Bucur <marius.bucur(a)1and1.ro> Date: Fri Jan 14 17:31:25 2011 +0200 modules_l/presence/notify.c fixed null pointer bug Added an additional check to avoid a possible dereference of a null pointer. --- modules_k/presence/notify.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/presence/notify.c b/modules_k/presence/notify.c index 6f471c3..2c90640 100644 --- a/modules_k/presence/notify.c +++ b/modules_k/presence/notify.c @@ -1694,7 +1694,7 @@ void p_tm_callback( struct cell *t, int type, struct tmcb_params *ps) ((c_back_param*)(*ps->param))->to_tag.s== NULL) { LM_DBG("message id not received\n"); - if(*ps->param !=NULL ) + if(ps->param != NULL && *ps->param !=NULL) free_cbparam((c_back_param*)(*ps->param)); return; }

1 0

git:master: Merge branch 'master' of ssh://git.sip-router.org/sip-router
by Marius Ovidiu Bucur 14 Jan '11

14 Jan '11

Module: sip-router Branch: master Commit: 9cf0858d0022698a9856c2f6bf67ceb6c426acfb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9cf0858… Author: Marius Bucur <marius.bucur(a)1and1.ro> Committer: Marius Bucur <marius.bucur(a)1and1.ro> Date: Fri Jan 14 17:33:40 2011 +0200 Merge branch 'master' of ssh://git.sip-router.org/sip-router ---

1 0

git:master: modules_s/register Prevented crash in case of incorrect uri
by Marius Zbihlei 14 Jan '11

14 Jan '11

Module: sip-router Branch: master Commit: 302d55cab249b25faf8bebb756a0cf5600607b3f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=302d55c… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Fri Jan 14 16:58:03 2011 +0200 modules_s/register Prevented crash in case of incorrect uri Error logic performed a free_params on an garbage value (not initialized) Reported by clang & llvm --- modules_s/registrar/save.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_s/registrar/save.c b/modules_s/registrar/save.c index 045e139..8550d3c 100644 --- a/modules_s/registrar/save.c +++ b/modules_s/registrar/save.c @@ -281,7 +281,7 @@ int parse_uri_dstip(str* received, struct ip_addr* ip, unsigned short* port, struct sip_uri puri; param_hooks_t hooks; struct ip_addr* p; - param_t* params; + param_t* params = 0; int error; if (unlikely(!received)) return 0;

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2011