sr-dev July 2017

sr-dev@lists.kamailio.org

23 participants
410 discussions

Re: [sr-dev] [kamailio/kamailio] sipcapture: keep hep buffer unmodified while getting PV $hep(NNN) (9f838d4)

by Alexandr Dubovikov

thanks! :) -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/9f838d4faf940bd2a6a5e6f778a34dd…

6 years, 11 months

[kamailio/kamailio] sipcapture: byteorder fixes (#1191)

by Mikko Lehto

Without commit 6e43bf8, using $hep() in script gives inconsistent results due to multiple byte order conversions. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1191 -- Commit Summary -- * sipcapture: remove excess byte order conversion * sipcapture: add missing or invalid byte order conversion -- File Changes -- M src/modules/sipcapture/hep.c (49) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1191.patch https://github.com/kamailio/kamailio/pull/1191.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1191

6 years, 11 months

git:master:4068ddd3: rls: avoid access to item after free

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4068ddd3ca01795e5378a738756b2735508f5864 URL: https://github.com/kamailio/kamailio/commit/4068ddd3ca01795e5378a738756b273… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-31T08:20:08+02:00 rls: avoid access to item after free --- Modified: src/modules/rls/list.h --- Diff: https://github.com/kamailio/kamailio/commit/4068ddd3ca01795e5378a738756b273… Patch: https://github.com/kamailio/kamailio/commit/4068ddd3ca01795e5378a738756b273… --- diff --git a/src/modules/rls/list.h b/src/modules/rls/list.h index 6958ad6d9b..d2ed3f2c9e 100644 --- a/src/modules/rls/list.h +++ b/src/modules/rls/list.h @@ -105,14 +105,13 @@ static inline list_entry_t *list_remove(str strng, list_entry_t *list) { if (strncmp(p->strng->s, strng.s, strng.len) == 0) { + list = list->next; pkg_free(p->strng->s); pkg_free(p->strng); pkg_free(p); - return list->next; - } - else - { - list_entry_t *p = list, *q; + return list; + } else { + list_entry_t *q; while (p->next != NULL && (cmp = strncmp(p->next->strng->s, strng.s, strng.len)) < 0) p = p->next;

6 years, 11 months

git:master:24c4f357: ctl: safety check for closing fd

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 24c4f357ecc83ded4c8890ed4440a0252191b0a9 URL: https://github.com/kamailio/kamailio/commit/24c4f357ecc83ded4c8890ed4440a02… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-30T18:33:55+02:00 ctl: safety check for closing fd --- Modified: src/modules/ctl/ctl.c Modified: src/modules/ctl/ctrl_socks.c --- Diff: https://github.com/kamailio/kamailio/commit/24c4f357ecc83ded4c8890ed4440a02… Patch: https://github.com/kamailio/kamailio/commit/24c4f357ecc83ded4c8890ed4440a02… --- diff --git a/src/modules/ctl/ctl.c b/src/modules/ctl/ctl.c index 2126a00ac7..6f627dcb64 100644 --- a/src/modules/ctl/ctl.c +++ b/src/modules/ctl/ctl.c @@ -376,7 +376,7 @@ static void mod_destroy(void) switch(cs->transport){ case UNIXS_SOCK: case UNIXD_SOCK: - close(cs->fd); + if(cs->fd>=0) close(cs->fd); cs->fd=-1; if (cs->write_fd!=-1){ close(cs->write_fd); diff --git a/src/modules/ctl/ctrl_socks.c b/src/modules/ctl/ctrl_socks.c index 1538346206..9e800a907b 100644 --- a/src/modules/ctl/ctrl_socks.c +++ b/src/modules/ctl/ctrl_socks.c @@ -133,7 +133,6 @@ struct id_list* parse_listen_id(char* l, int len, enum socket_protos def) end: /* fix all the stuff */ - if (name==0) goto error; if (proto==UNKNOWN_SOCK){ /* try to guess */ if (port_str){

6 years, 11 months

git:master:649b789c: call_control: check return values and free in case of errors in fixup

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 649b789ccde40778543f2a973a1c01495a2cba8b URL: https://github.com/kamailio/kamailio/commit/649b789ccde40778543f2a973a1c014… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-30T18:18:24+02:00 call_control: check return values and free in case of errors in fixup --- Modified: src/modules/call_control/call_control.c --- Diff: https://github.com/kamailio/kamailio/commit/649b789ccde40778543f2a973a1c014… Patch: https://github.com/kamailio/kamailio/commit/649b789ccde40778543f2a973a1c014… --- diff --git a/src/modules/call_control/call_control.c b/src/modules/call_control/call_control.c index e1776de61a..689a16d1fd 100644 --- a/src/modules/call_control/call_control.c +++ b/src/modules/call_control/call_control.c @@ -245,6 +245,7 @@ int cc_parse_param(void *val, AVP_List** avps) { char *p = NULL; + char *p0 = NULL; str s, content; AVP_List *mp = NULL; @@ -258,13 +259,13 @@ cc_parse_param(void *val, AVP_List** avps) { return -1; } - p = (char*) pkg_malloc (content.len + 1); - CHECK_ALLOC(p); + p0 = (char*) pkg_malloc (content.len + 1); + CHECK_ALLOC(p0); + p = p0; p[content.len] = '\0'; memcpy(p, content.s, content.len); - for (;*p != '\0';) { mp = (AVP_List*) pkg_malloc (sizeof(AVP_List)); @@ -296,8 +297,13 @@ cc_parse_param(void *val, AVP_List** avps) { s.len = strlen(p); p = pv_parse_spec(&s, mp->pv); + if(p==NULL) { + LM_ERR("failed to parse pv spec\n"); + goto error; + } for (; isspace(*p); p++); + *avps = mp; } @@ -310,6 +316,7 @@ cc_parse_param(void *val, AVP_List** avps) { } pkg_free(mp); } + if(p0) pkg_free(p0); return -1; } @@ -581,6 +588,7 @@ make_custom_request(struct sip_msg *msg, CallInfo *call) { static char request[8192]; int len = 0; + int len0 = 0; AVP_List *al; pv_value_t pt; @@ -601,21 +609,26 @@ make_custom_request(struct sip_msg *msg, CallInfo *call) } for (; al; al = al->next) { - pv_get_spec_value(msg, al->pv, &pt); + if(pv_get_spec_value(msg, al->pv, &pt)<0) { + LM_ERR("failed to get pv value\n"); + return NULL; + } if (pt.flags & PV_VAL_INT) { - len += snprintf(request + len, sizeof(request), + len += snprintf(request + len0, sizeof(request)-len0, "%.*s = %d ", al->name.len, al->name.s, pt.ri); } else if (pt.flags & PV_VAL_STR) { - len += snprintf(request + len, sizeof(request), + len += snprintf(request + len0, sizeof(request)-len0, "%.*s = %.*s ", al->name.len, al->name.s, pt.rs.len, pt.rs.s); } - if (len >= sizeof(request)) { - LM_ERR("callcontrol request is longer than %ld bytes\n", (unsigned long)sizeof(request)); + if (len >= sizeof(request)-len0) { + LM_ERR("callcontrol request is longer than %ld bytes\n", + (unsigned long)sizeof(request)); return NULL; - } + } + len0 = len; }

6 years, 11 months

git:master:950a9fa4: mangler: free on errors inside sdp_mangle_port()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 950a9fa428e24242671e83980192db48819d5da6 URL: https://github.com/kamailio/kamailio/commit/950a9fa428e24242671e83980192db4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-30T11:16:01+02:00 mangler: free on errors inside sdp_mangle_port() --- Modified: src/modules/mangler/sdp_mangler.c --- Diff: https://github.com/kamailio/kamailio/commit/950a9fa428e24242671e83980192db4… Patch: https://github.com/kamailio/kamailio/commit/950a9fa428e24242671e83980192db4…

6 years, 11 months

git:master:c6464e27: rtpproxy: safety checks for return codes, free on fixup errors

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c6464e2752f7cdaee95aee4d1b0da9317535ddd3 URL: https://github.com/kamailio/kamailio/commit/c6464e2752f7cdaee95aee4d1b0da93… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-30T10:45:58+02:00 rtpproxy: safety checks for return codes, free on fixup errors --- Modified: src/modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/c6464e2752f7cdaee95aee4d1b0da93… Patch: https://github.com/kamailio/kamailio/commit/c6464e2752f7cdaee95aee4d1b0da93…

6 years, 11 months

git:master:590c8d9d: tls: removed useless checks

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 590c8d9d23e578df38d332ebcfa64421bbedb604 URL: https://github.com/kamailio/kamailio/commit/590c8d9d23e578df38d332ebcfa6442… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-30T10:30:59+02:00 tls: removed useless checks --- Modified: src/modules/tls/tls_domain.c Modified: src/modules/tls/tls_select.c --- Diff: https://github.com/kamailio/kamailio/commit/590c8d9d23e578df38d332ebcfa6442… Patch: https://github.com/kamailio/kamailio/commit/590c8d9d23e578df38d332ebcfa6442… --- diff --git a/src/modules/tls/tls_domain.c b/src/modules/tls/tls_domain.c index a56c76e2b3..d515402cc9 100644 --- a/src/modules/tls/tls_domain.c +++ b/src/modules/tls/tls_domain.c @@ -1086,12 +1086,12 @@ static int fix_domain(tls_domain_t* d, tls_domain_t* def) */ static int passwd_cb(char *buf, int size, int rwflag, void *filename) { -#if OPENSSL_VERSION_NUMBER >= 0x00907000L - UI *ui; - const char *prompt; - +#if OPENSSL_VERSION_NUMBER >= 0x00907000L + UI *ui; + const char *prompt; + ui = UI_new(); - if (ui == NULL) + if(ui == NULL) goto err; prompt = UI_construct_prompt(ui, "passphrase", filename); @@ -1099,16 +1099,13 @@ static int passwd_cb(char *buf, int size, int rwflag, void *filename) UI_process(ui); UI_free(ui); return strlen(buf); - - err: + +err: ERR("passwd_cb: Error in passwd_cb\n"); - if (ui) { - UI_free(ui); - } return 0; - + #else - if (des_read_pw_string(buf, size-1, "Enter Private Key password:", 0)) { + if(des_read_pw_string(buf, size - 1, "Enter Private Key password:", 0)) { ERR("Error in passwd_cb\n"); return 0; } diff --git a/src/modules/tls/tls_select.c b/src/modules/tls/tls_select.c index fd84506a36..c1c44c3763 100644 --- a/src/modules/tls/tls_select.c +++ b/src/modules/tls/tls_select.c @@ -461,7 +461,6 @@ static int check_cert(str* res, int* ires, int local, int err, sip_msg_t* msg) return 0; error: - if (cert) X509_free(cert); if (c) tcpconn_put(c); return -1; }

6 years, 11 months

git:master:5c58ac72: websocket: use NAME in log message, removed unreachable code

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5c58ac726c1f96b6666cfd05e13a66328d46d020 URL: https://github.com/kamailio/kamailio/commit/5c58ac726c1f96b6666cfd05e13a663… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-30T10:30:19+02:00 websocket: use NAME in log message, removed unreachable code --- Modified: src/modules/websocket/ws_frame.c --- Diff: https://github.com/kamailio/kamailio/commit/5c58ac726c1f96b6666cfd05e13a663… Patch: https://github.com/kamailio/kamailio/commit/5c58ac726c1f96b6666cfd05e13a663… --- diff --git a/src/modules/websocket/ws_frame.c b/src/modules/websocket/ws_frame.c index 6af2bb039e..8e632892f6 100644 --- a/src/modules/websocket/ws_frame.c +++ b/src/modules/websocket/ws_frame.c @@ -199,11 +199,11 @@ static int encode_and_send_ws_frame(ws_frame_t *frame, conn_close_t conn_close) if (frame->payload_len < 126) extended_length = 0; else if (frame->payload_len <= USHRT_MAX ) extended_length = 2; - else if (frame->payload_len <= UINT_MAX) extended_length = 4; + else if (frame->payload_len < UINT_MAX) extended_length = 4; else { - LM_ERR("Kamailio only supports WebSocket frames with payload " - "<= %u\n", UINT_MAX); + LM_ERR(NAME " only supports WebSocket frames with payload " + "< %u\n", UINT_MAX); return -1; } @@ -759,11 +759,6 @@ int ws_frame_receive(sr_event_param_t *evp) wsconn_put(frame.wsc); return -1; } - - /* how can we get here ? */ - wsconn_put(frame.wsc); - - return 0; } int ws_frame_transmit(sr_event_param_t *evp)

6 years, 11 months

git:master:8b063975: xhttp_pi: several compiler warning fixes

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8b06397523c440fc20e509889c5fad01ed477d26 URL: https://github.com/kamailio/kamailio/commit/8b06397523c440fc20e509889c5fad0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-30T10:18:24+02:00 xhttp_pi: several compiler warning fixes --- Modified: src/modules/xhttp_pi/xhttp_pi_fnc.c --- Diff: https://github.com/kamailio/kamailio/commit/8b06397523c440fc20e509889c5fad0… Patch: https://github.com/kamailio/kamailio/commit/8b06397523c440fc20e509889c5fad0…

6 years, 11 months

← Newer
1
...
7
8
9
10
11
12
13
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2017