sr-dev December 2017

sr-dev@lists.kamailio.org

26 participants
475 discussions

git:5.1:c31f33de: cplc: null terminate log string
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: 5.1 Commit: c31f33de17067cbe29042b4558f28aad59ec25f0 URL: https://github.com/kamailio/kamailio/commit/c31f33de17067cbe29042b4558f28aa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T16:54:21+01:00 cplc: null terminate log string - reset field to avoid double free (cherry picked from commit 66051f400c0a1dcd472f0c9a7957b24e9cb54a07) --- Modified: src/modules/cplc/cpl_log.c Modified: src/modules/cplc/cpl_time.c --- Diff: https://github.com/kamailio/kamailio/commit/c31f33de17067cbe29042b4558f28aa… Patch: https://github.com/kamailio/kamailio/commit/c31f33de17067cbe29042b4558f28aa… --- diff --git a/src/modules/cplc/cpl_log.c b/src/modules/cplc/cpl_log.c index 195b11c7b7..39ad19b32f 100644 --- a/src/modules/cplc/cpl_log.c +++ b/src/modules/cplc/cpl_log.c @@ -84,7 +84,7 @@ void compile_logs( str *log) log->len += cpl_logs[i].len; /* get a buffer */ - log->s = (char*)pkg_malloc(log->len); + log->s = (char*)pkg_malloc(log->len+1); if (log->s==0) { LM_ERR("no more pkg mem\n"); log->len = 0; @@ -97,6 +97,7 @@ void compile_logs( str *log) memcpy( p, cpl_logs[i].s, cpl_logs[i].len); p += cpl_logs[i].len; } + log->s[log->len] = '\0'; return; } diff --git a/src/modules/cplc/cpl_time.c b/src/modules/cplc/cpl_time.c index 36758f8e19..653c3a2352 100644 --- a/src/modules/cplc/cpl_time.c +++ b/src/modules/cplc/cpl_time.c @@ -328,6 +328,7 @@ int tr_byxxx_init(tr_byxxx_p _bxp, int _nr) if(!_bxp->req) { pkg_free(_bxp->xxx); + _bxp->xxx = NULL; return -1; }

1 0

git:master:f6a05336: sipdump: safety check for received address
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: master Commit: f6a05336de65bb929854c5843e5aa821901b63eb URL: https://github.com/kamailio/kamailio/commit/f6a05336de65bb929854c5843e5aa82… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T16:50:51+01:00 sipdump: safety check for received address --- Modified: src/modules/sipdump/sipdump_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f6a05336de65bb929854c5843e5aa82… Patch: https://github.com/kamailio/kamailio/commit/f6a05336de65bb929854c5843e5aa82… --- diff --git a/src/modules/sipdump/sipdump_mod.c b/src/modules/sipdump/sipdump_mod.c index c95e0b091a..3247d71a70 100644 --- a/src/modules/sipdump/sipdump_mod.c +++ b/src/modules/sipdump/sipdump_mod.c @@ -229,7 +229,8 @@ int ki_sipdump_send(sip_msg_t *msg, str *stag) } sdi.af.len = 4; - if(msg->rcv.bind_address->address.af==AF_INET6) { + if(msg->rcv.bind_address!=NULL + && msg->rcv.bind_address->address.af==AF_INET6) { sdi.af.s = "ipv6"; } else { sdi.af.s = "ipv4"; @@ -298,7 +299,8 @@ int sipdump_msg_received(sr_event_param_t *evp) sdi.dst_port = (int)evp->rcv->bind_address->port_no; } sdi.af.len = 4; - if(evp->rcv->bind_address->address.af==AF_INET6) { + if(evp->rcv->bind_address!=NULL + && evp->rcv->bind_address->address.af==AF_INET6) { sdi.af.s = "ipv6"; } else { sdi.af.s = "ipv4";

1 0

git:master:5f62d051: rls: avoid walking a null string
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: master Commit: 5f62d05180c7148f3899732dfc0da44034a314f8 URL: https://github.com/kamailio/kamailio/commit/5f62d05180c7148f3899732dfc0da44… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T16:50:51+01:00 rls: avoid walking a null string --- Modified: src/modules/rls/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/5f62d05180c7148f3899732dfc0da44… Patch: https://github.com/kamailio/kamailio/commit/5f62d05180c7148f3899732dfc0da44… --- diff --git a/src/modules/rls/notify.c b/src/modules/rls/notify.c index 9b5c3a5806..55a7019032 100644 --- a/src/modules/rls/notify.c +++ b/src/modules/rls/notify.c @@ -1220,7 +1220,7 @@ int parse_xcap_uri(char *uri, str *host, unsigned short *port, str *path) } } - while(path->s[path->len] != '\0') path->len++; + while(path->s != NULL && path->s[path->len] != '\0') path->len++; return 1; }

1 0

git:master:a009a5bf: pua: safety check for params values
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: master Commit: a009a5bf4f145b4e877e5ba41d218607c30849ec URL: https://github.com/kamailio/kamailio/commit/a009a5bf4f145b4e877e5ba41d21860… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T16:50:51+01:00 pua: safety check for params values --- Modified: src/modules/pua/send_subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/a009a5bf4f145b4e877e5ba41d21860… Patch: https://github.com/kamailio/kamailio/commit/a009a5bf4f145b4e877e5ba41d21860… --- diff --git a/src/modules/pua/send_subscribe.c b/src/modules/pua/send_subscribe.c index 89b597a77a..b75290b936 100644 --- a/src/modules/pua/send_subscribe.c +++ b/src/modules/pua/send_subscribe.c @@ -803,7 +803,7 @@ ua_pres_t* subscribe_cbparam(subs_info_t* subs, int ua_flag) hentity->contact.len= subs->contact->len; size+= subs->contact->len; - if(subs->outbound_proxy) + if(subs->outbound_proxy && subs->outbound_proxy->s) { hentity->outbound_proxy= (str*)((char*)hentity+ size); size+= sizeof(str); @@ -821,7 +821,7 @@ ua_pres_t* subscribe_cbparam(subs_info_t* subs, int ua_flag) { CONT_COPY(hentity, hentity->id, subs->id); } - if(subs->extra_headers) + if(subs->extra_headers && hentity->extra_headers->s) { hentity->extra_headers= (str*)((char*)hentity+ size); size+= sizeof(str);

1 0

git:master:236b0b4b: auth_ephemeral: init the return code
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: master Commit: 236b0b4bca0ce8931bd06fd88720f3293b651682 URL: https://github.com/kamailio/kamailio/commit/236b0b4bca0ce8931bd06fd88720f32… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T16:50:51+01:00 auth_ephemeral: init the return code --- Modified: src/modules/auth_ephemeral/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/236b0b4bca0ce8931bd06fd88720f32… Patch: https://github.com/kamailio/kamailio/commit/236b0b4bca0ce8931bd06fd88720f32… --- diff --git a/src/modules/auth_ephemeral/authorize.c b/src/modules/auth_ephemeral/authorize.c index 8e4489947c..745f12d7ab 100644 --- a/src/modules/auth_ephemeral/authorize.c +++ b/src/modules/auth_ephemeral/authorize.c @@ -213,7 +213,7 @@ static inline int digest_authenticate(struct sip_msg *_m, str *_realm, hdr_types_t _hftype, str *_method) { struct hdr_field* h; - auth_cfg_result_t ret; + auth_cfg_result_t ret = AUTH_ERROR; auth_result_t rauth; struct secret *secret_struct; str username; @@ -548,4 +548,4 @@ int autheph_authenticate(struct sip_msg *_m, char *_username, char *_password) } return ki_autheph_authenticate(_m, &susername, &spassword); -} \ No newline at end of file +}

1 0

git:master:084364be: tls: safety checks for select values
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: master Commit: 084364becd2f6f5d6e620721cb0837466c3a2f31 URL: https://github.com/kamailio/kamailio/commit/084364becd2f6f5d6e620721cb08374… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T16:50:51+01:00 tls: safety checks for select values --- Modified: src/modules/tls/tls_select.c --- Diff: https://github.com/kamailio/kamailio/commit/084364becd2f6f5d6e620721cb08374… Patch: https://github.com/kamailio/kamailio/commit/084364becd2f6f5d6e620721cb08374… --- diff --git a/src/modules/tls/tls_select.c b/src/modules/tls/tls_select.c index c1c44c3763..ba765ff755 100644 --- a/src/modules/tls/tls_select.c +++ b/src/modules/tls/tls_select.c @@ -198,7 +198,11 @@ static int get_cipher(str* res, sip_msg_t* msg) ERR("Cipher name too long\n"); goto err; } - memcpy(buf, cipher.s, cipher.len); + if(cipher.s!=NULL && cipher.len>0) { + memcpy(buf, cipher.s, cipher.len); + } else { + buf[0] = '\0'; + } res->s = buf; res->len = cipher.len; tcpconn_put(c); @@ -298,7 +302,11 @@ static int get_version(str* res, sip_msg_t* msg) ERR("Version string too long\n"); goto err; } - memcpy(buf, version.s, version.len); + if(version.s!=NULL && version.len>0) { + memcpy(buf, version.s, version.len); + } else { + buf[0] = '\0'; + } res->s = buf; res->len = version.len; tcpconn_put(c);

1 0

git:master:da31e70a: core: select - init proto string to udp
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: master Commit: da31e70a2c63454dd7126d6ed47be977f36c73f0 URL: https://github.com/kamailio/kamailio/commit/da31e70a2c63454dd7126d6ed47be97… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T16:50:51+01:00 core: select - init proto string to udp --- Modified: src/core/select_core.c --- Diff: https://github.com/kamailio/kamailio/commit/da31e70a2c63454dd7126d6ed47be97… Patch: https://github.com/kamailio/kamailio/commit/da31e70a2c63454dd7126d6ed47be97… --- diff --git a/src/core/select_core.c b/src/core/select_core.c index d1f2ae7b4d..112dee489e 100644 --- a/src/core/select_core.c +++ b/src/core/select_core.c @@ -1286,7 +1286,7 @@ ABSTRACT_F(select_dst) ABSTRACT_F(select_rcv) int select_ip_port(str* res, select_t* s, struct sip_msg* msg) { - str ip_str=STR_NULL, port_str=STR_NULL, proto_str=STR_NULL; + str ip_str=STR_NULL, port_str=STR_NULL, proto_str=str_init("udp"); int param, pos;

1 0

git:master:b9bbeeb1: core: receive - clang format the code
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: master Commit: b9bbeeb11df841845d9f00897008fedf2c2eb9b6 URL: https://github.com/kamailio/kamailio/commit/b9bbeeb11df841845d9f00897008fed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T16:50:51+01:00 core: receive - clang format the code --- Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/b9bbeeb11df841845d9f00897008fed… Patch: https://github.com/kamailio/kamailio/commit/b9bbeeb11df841845d9f00897008fed…

1 0

git:master:1be7a690: db2_ops: safety check for input parameter
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: master Commit: 1be7a6903ace085e7518fa0d358a4ca899ee938f URL: https://github.com/kamailio/kamailio/commit/1be7a6903ace085e7518fa0d358a4ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T16:50:51+01:00 db2_ops: safety check for input parameter --- Modified: src/modules/db2_ops/db2_ops.c Modified: src/modules/jsonrpcc/jsonrpc_io.c --- Diff: https://github.com/kamailio/kamailio/commit/1be7a6903ace085e7518fa0d358a4ca… Patch: https://github.com/kamailio/kamailio/commit/1be7a6903ace085e7518fa0d358a4ca… --- diff --git a/src/modules/db2_ops/db2_ops.c b/src/modules/db2_ops/db2_ops.c index 647faceb1c..dca2c81a1c 100644 --- a/src/modules/db2_ops/db2_ops.c +++ b/src/modules/db2_ops/db2_ops.c @@ -201,6 +201,9 @@ static int split_fields(char *part, int *n, struct xlstr **strs) { int i, res; char *c, *fld; + if(part==NULL || *part=='\0') + return -1; + *n = 0; *strs = 0; c = part; diff --git a/src/modules/jsonrpcc/jsonrpc_io.c b/src/modules/jsonrpcc/jsonrpc_io.c index ae96ace9c0..ddefd1b3a1 100644 --- a/src/modules/jsonrpcc/jsonrpc_io.c +++ b/src/modules/jsonrpcc/jsonrpc_io.c @@ -219,6 +219,7 @@ void cmd_pipe_cb(int fd, short event, void *arg) if (timerfd_settime(timerfd, 0, itime, NULL) == -1) { LM_ERR("Could not set timer."); + pkg_free(itime); goto error; } pkg_free(itime);

1 0

git:master:3614b4e6: db_postgres: avoid potential double free if sb url parsing fails
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: master Commit: 3614b4e66d1b57dc722139fc0e1ccd8d838f13ee URL: https://github.com/kamailio/kamailio/commit/3614b4e66d1b57dc722139fc0e1ccd8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T16:50:51+01:00 db_postgres: avoid potential double free if sb url parsing fails --- Modified: src/modules/db_postgres/pg_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/3614b4e66d1b57dc722139fc0e1ccd8… Patch: https://github.com/kamailio/kamailio/commit/3614b4e66d1b57dc722139fc0e1ccd8… --- diff --git a/src/modules/db_postgres/pg_uri.c b/src/modules/db_postgres/pg_uri.c index 6170de310e..3e4f9a32bc 100644 --- a/src/modules/db_postgres/pg_uri.c +++ b/src/modules/db_postgres/pg_uri.c @@ -255,8 +255,10 @@ static int parse_postgres_uri(struct pg_uri *res, str *uri) return 0; err: - if(prev_token) - pkg_free(prev_token); + if(prev_token) { + if(res==NULL || (res->username!=prev_token && res->host!=prev_token)) + pkg_free(prev_token); + } if(res == NULL) return -1; if(res->username) {

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2017