sr-dev May 2015

sr-dev@lists.kamailio.org

34 participants
297 discussions

git:4.2:b103dff8: regex: reset pointer after free to avoid double free if an error occurs
by Daniel-Constantin Mierla 19 May '15

19 May '15

Module: kamailio Branch: 4.2 Commit: b103dff88f4ac83acf20798c06d43b2586810a36 URL: https://github.com/kamailio/kamailio/commit/b103dff88f4ac83acf20798c06d43b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-19T09:29:25+02:00 regex: reset pointer after free to avoid double free if an error occurs (cherry picked from commit 379667e878c9e0795998f600edbcbb3974846f71) --- Modified: modules/regex/regex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b103dff88f4ac83acf20798c06d43b2… Patch: https://github.com/kamailio/kamailio/commit/b103dff88f4ac83acf20798c06d43b2… --- diff --git a/modules/regex/regex_mod.c b/modules/regex/regex_mod.c index 59cd566..5b8b5cc 100644 --- a/modules/regex/regex_mod.c +++ b/modules/regex/regex_mod.c @@ -418,6 +418,7 @@ static int load_pcres(int action) memcpy(pcres_tmp[i], pcre_tmp, pcre_size); pcre_free(pcre_tmp); pkg_free(patterns[i]); + patterns[i] = NULL; } /* Copy to shared memory */

1 0

git:4.2:bae15394: imc: better condition to catch no result of database query
by Daniel-Constantin Mierla 19 May '15

19 May '15

Module: kamailio Branch: 4.2 Commit: bae153942524b1d86e29f10208e35dbf088d7db5 URL: https://github.com/kamailio/kamailio/commit/bae153942524b1d86e29f10208e35db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-19T09:29:14+02:00 imc: better condition to catch no result of database query (cherry picked from commit 29d7ca71fdfc8c52fb5e68fcf3bccf98dde0d089) --- Modified: modules/imc/imc.c --- Diff: https://github.com/kamailio/kamailio/commit/bae153942524b1d86e29f10208e35db… Patch: https://github.com/kamailio/kamailio/commit/bae153942524b1d86e29f10208e35db… --- diff --git a/modules/imc/imc.c b/modules/imc/imc.c index f54b2be..8fbfd14 100644 --- a/modules/imc/imc.c +++ b/modules/imc/imc.c @@ -200,10 +200,10 @@ int add_from_db(void) LM_ERR("failed to querry table\n"); return -1; } - if(r_res && r_res->n<=0) + if(r_res==NULL || r_res->n<=0) { LM_INFO("the query returned no result\n"); - imc_dbf.free_result(imc_db, r_res); + if(r_res) imc_dbf.free_result(imc_db, r_res); r_res = NULL; return 0; }

1 0

git:4.2:a8977842: pua: safety checks for str pointers
by Daniel-Constantin Mierla 19 May '15

19 May '15

Module: kamailio Branch: 4.2 Commit: a89778423e4886ac48857253d9567d17040e3b45 URL: https://github.com/kamailio/kamailio/commit/a89778423e4886ac48857253d9567d1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-19T09:28:55+02:00 pua: safety checks for str pointers (cherry picked from commit 80977adc1bd70479c1e32d867563e4e684060b25) --- Modified: modules/pua/send_subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/a89778423e4886ac48857253d9567d1… Patch: https://github.com/kamailio/kamailio/commit/a89778423e4886ac48857253d9567d1… --- diff --git a/modules/pua/send_subscribe.c b/modules/pua/send_subscribe.c index 17a4f3f..5f4b0b8 100644 --- a/modules/pua/send_subscribe.c +++ b/modules/pua/send_subscribe.c @@ -888,7 +888,7 @@ ua_pres_t* subs_cbparam_indlg(ua_pres_t* subs, int expires, int ua_flag) CONT_COPY(hentity, hentity->contact, subs->contact) - if(subs->outbound_proxy) + if(subs->outbound_proxy && subs->outbound_proxy->len && subs->outbound_proxy->s) { hentity->outbound_proxy= (str*)((char*)hentity+ size); size+= sizeof(str); @@ -908,7 +908,7 @@ ua_pres_t* subs_cbparam_indlg(ua_pres_t* subs, int expires, int ua_flag) CONT_COPY(hentity, hentity->remote_contact, subs->remote_contact) } - if(subs->extra_headers) + if(subs->extra_headers && subs->extra_headers->s) { hentity->extra_headers= (str*)((char*)hentity+ size); size+= sizeof(str);

1 0

git:4.2:e759e5c8: core: init vars for socket ttl helper function to avoid warnings
by Daniel-Constantin Mierla 19 May '15

19 May '15

Module: kamailio Branch: 4.2 Commit: e759e5c8998958eca61b317135be0acb3088fac0 URL: https://github.com/kamailio/kamailio/commit/e759e5c8998958eca61b317135be0ac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-19T09:28:46+02:00 core: init vars for socket ttl helper function to avoid warnings (cherry picked from commit 23b476ed7c7b48ddd7cacf3d88e9c104db06d5dc) --- Modified: sock_ut.c --- Diff: https://github.com/kamailio/kamailio/commit/e759e5c8998958eca61b317135be0ac… Patch: https://github.com/kamailio/kamailio/commit/e759e5c8998958eca61b317135be0ac… --- diff --git a/sock_ut.c b/sock_ut.c index 3aee2cd..da46750 100644 --- a/sock_ut.c +++ b/sock_ut.c @@ -41,8 +41,8 @@ */ int sock_get_ttl(int sock) { - int ioptval; - unsigned int ioptvallen; + int ioptval = 0; + unsigned int ioptvallen = 0; ioptvallen=sizeof(ioptval); if (getsockopt( sock, IPPROTO_IP, IP_TTL, (void*) &ioptval, @@ -60,7 +60,7 @@ int sock_get_ttl(int sock) */ int sock_set_ttl(int sock, int ttl) { - int ioptval; + int ioptval = 0; if (setsockopt( sock, IPPROTO_IP, IP_TTL, (void*) &ioptval, sizeof(ioptval)) == -1 )

1 0

git:4.2:c5015138: presence: initialize variable to avoid compile warning
by Daniel-Constantin Mierla 19 May '15

19 May '15

Module: kamailio Branch: 4.2 Commit: c5015138170c9624055203cde4331091d96e928e URL: https://github.com/kamailio/kamailio/commit/c5015138170c9624055203cde433109… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-19T09:28:34+02:00 presence: initialize variable to avoid compile warning (cherry picked from commit c5ef9569d524ab49d538e85a905520b72e1d8dea) --- Modified: modules/presence/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/c5015138170c9624055203cde433109… Patch: https://github.com/kamailio/kamailio/commit/c5015138170c9624055203cde433109… --- diff --git a/modules/presence/subscribe.c b/modules/presence/subscribe.c index 334dc32..ce09e2f 100644 --- a/modules/presence/subscribe.c +++ b/modules/presence/subscribe.c @@ -806,7 +806,7 @@ int handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_domain) pres_ev_t* event= NULL; event_t* parsed_event= NULL; param_t* ev_param= NULL; - int found; + int found = 0; str reason= {0, 0}; struct sip_uri uri; int reply_code; @@ -992,7 +992,7 @@ int handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_domain) goto error; } LM_DBG("subscription status= %s - %s\n", get_status_str(subs.status), - found==0?"inserted":"found in watcher table"); + (found==0)?"inserted":"found in watcher table"); if (pres_notifier_processes > 0) {

1 0

git:4.2:50d9cf95: presence: initialize result to avoid freeing garbage in case of other errors
by Daniel-Constantin Mierla 19 May '15

19 May '15

Module: kamailio Branch: 4.2 Commit: 50d9cf9501f2ad3fbf9a282ea58055523b34d5cc URL: https://github.com/kamailio/kamailio/commit/50d9cf9501f2ad3fbf9a282ea580555… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-19T09:28:23+02:00 presence: initialize result to avoid freeing garbage in case of other errors (cherry picked from commit c24329ed483ea3abd720af73411a2331acc947e4) --- Modified: modules/presence/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/50d9cf9501f2ad3fbf9a282ea580555… Patch: https://github.com/kamailio/kamailio/commit/50d9cf9501f2ad3fbf9a282ea580555… --- diff --git a/modules/presence/notify.c b/modules/presence/notify.c index acf72db..bc4c442 100644 --- a/modules/presence/notify.c +++ b/modules/presence/notify.c @@ -2355,7 +2355,7 @@ static watcher_t *build_watchers_list(subs_t *sub) db_key_t query_cols[3], result_cols[4]; db_val_t query_vals[3], *values; db_row_t *rows; - db1_res_t *result; + db1_res_t *result = NULL; int n_query_cols = 0, n_result_cols = 0; int wuser_col, wdomain_col, callid_col, status_col; int i;

1 0

git:4.2:6495f412: evapi: use internal log functions and free io struct if client failed to connect
by Daniel-Constantin Mierla 19 May '15

19 May '15

Module: kamailio Branch: 4.2 Commit: 6495f4120a702bd852c11d3449467e5ee0994bf7 URL: https://github.com/kamailio/kamailio/commit/6495f4120a702bd852c11d3449467e5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-19T09:26:12+02:00 evapi: use internal log functions and free io struct if client failed to connect (cherry picked from commit eb889f41f036afb4248303fd6a1c7db393724c58) --- Modified: modules/evapi/evapi_dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/6495f4120a702bd852c11d3449467e5… Patch: https://github.com/kamailio/kamailio/commit/6495f4120a702bd852c11d3449467e5… --- diff --git a/modules/evapi/evapi_dispatch.c b/modules/evapi/evapi_dispatch.c index 1ba1c0b..3029d77 100644 --- a/modules/evapi/evapi_dispatch.c +++ b/modules/evapi/evapi_dispatch.c @@ -332,12 +332,13 @@ void evapi_accept_client(struct ev_loop *loop, struct ev_io *watcher, int revent evapi_client = (struct ev_io*) malloc (sizeof(struct ev_io)); if(evapi_client==NULL) { - perror("no more memory\n"); + LM_ERR("no more memory\n"); return; } if(EV_ERROR & revents) { - perror("received invalid event\n"); + LM_ERR("received invalid event\n"); + free(evapi_client); return; } @@ -346,6 +347,7 @@ void evapi_accept_client(struct ev_loop *loop, struct ev_io *watcher, int revent if (csock < 0) { LM_ERR("cannot accept the client\n"); + free(evapi_client); return; } for(i=0; i<EVAPI_MAX_CLIENTS; i++) { @@ -357,6 +359,7 @@ void evapi_accept_client(struct ev_loop *loop, struct ev_io *watcher, int revent EVAPI_IPADDR_SIZE)==NULL) { LM_ERR("cannot convert ipv4 address\n"); close(csock); + free(evapi_client); return; } } else { @@ -366,6 +369,7 @@ void evapi_accept_client(struct ev_loop *loop, struct ev_io *watcher, int revent EVAPI_IPADDR_SIZE)==NULL) { LM_ERR("cannot convert ipv6 address\n"); close(csock); + free(evapi_client); return; } } @@ -378,6 +382,7 @@ void evapi_accept_client(struct ev_loop *loop, struct ev_io *watcher, int revent if(i==EVAPI_MAX_CLIENTS) { LM_ERR("too many clients\n"); close(csock); + free(evapi_client); return; } @@ -389,8 +394,10 @@ void evapi_accept_client(struct ev_loop *loop, struct ev_io *watcher, int revent evenv.eset = 1; evapi_run_cfg_route(&evenv, _evapi_rts.con_new); - if(_evapi_clients[i].connected == 0) + if(_evapi_clients[i].connected == 0) { + free(evapi_client); return; + } /* start watcher to read messages from whatchers */ ev_io_init(evapi_client, evapi_recv_client, csock, EV_READ);

1 0

Planning to release Kamailio v4.2.5
by Daniel-Constantin Mierla 19 May '15

19 May '15

Hello, I am considering to release a new maintenance version from latest stable branch - to be v4.2.5 - next week, most likely on Tuesday (May 19) or Wednesday (May 20). If there is anything important to get in and not discussed yet, bring the topic on development mailing list. Cheers, Daniel -- Daniel-Constantin Mierla http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio World Conference, May 27-29, 2015 Berlin, Germany - http://www.kamailioworld.com

1 1

git:4.2:129e1456: core: Fix crash in xavp.c
by Hugh Waite 18 May '15

18 May '15

Module: kamailio Branch: 4.2 Commit: 129e1456bd5369912690245b5a21b0591ead51f4 URL: https://github.com/kamailio/kamailio/commit/129e1456bd5369912690245b5a21b05… Author: Hugh Waite <hugh.waite(a)acision.com> Committer: Hugh Waite <hugh.waite(a)acision.com> Date: 2015-05-18T17:53:57+01:00 core: Fix crash in xavp.c - Inserting an xavp into a list can crash when inserting XTYPE_NULL padding entries (cherry picked from commit 497b6ad2cee8481ba1f3568ed7d8a836e508016a) --- Modified: xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/129e1456bd5369912690245b5a21b05… Patch: https://github.com/kamailio/kamailio/commit/129e1456bd5369912690245b5a21b05… --- diff --git a/xavp.c b/xavp.c index 0d73fd3..f7cb360 100644 --- a/xavp.c +++ b/xavp.c @@ -725,8 +725,7 @@ int xavp_insert(sr_xavp_t *xavp, int idx, sr_xavp_t **list) if(crt==NULL) return -1; if (lst == NULL) { - crt->next = *list; - *list = crt; + xavp_add(crt, list); } else { crt->next = lst->next; lst->next = crt;

1 0

git:master:497b6ad2: core: Fix crash in xavp.c
by Hugh Waite 18 May '15

18 May '15

Module: kamailio Branch: master Commit: 497b6ad2cee8481ba1f3568ed7d8a836e508016a URL: https://github.com/kamailio/kamailio/commit/497b6ad2cee8481ba1f3568ed7d8a83… Author: Hugh Waite <hugh.waite(a)acision.com> Committer: Hugh Waite <hugh.waite(a)acision.com> Date: 2015-05-18T17:00:08+01:00 core: Fix crash in xavp.c - Inserting an xavp into a list can crash when inserting XTYPE_NULL padding entries --- Modified: xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/497b6ad2cee8481ba1f3568ed7d8a83… Patch: https://github.com/kamailio/kamailio/commit/497b6ad2cee8481ba1f3568ed7d8a83… --- diff --git a/xavp.c b/xavp.c index 1906fd8..a6c62e7 100644 --- a/xavp.c +++ b/xavp.c @@ -723,8 +723,7 @@ int xavp_insert(sr_xavp_t *xavp, int idx, sr_xavp_t **list) if(crt==NULL) return -1; if (lst == NULL) { - crt->next = *list; - *list = crt; + xavp_add(crt, list); } else { crt->next = lst->next; lst->next = crt;

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2015