sr-dev May 2021

sr-dev@lists.kamailio.org

12 participants
289 discussions

git:5.4:dd09c233: core: xavp - safety checks for name len
by Daniel-Constantin Mierla 26 May '21

26 May '21

Module: kamailio Branch: 5.4 Commit: dd09c233417129694ffb7481b03d465defae447d URL: https://github.com/kamailio/kamailio/commit/dd09c233417129694ffb7481b03d465… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-26T08:29:04+02:00 core: xavp - safety checks for name len (cherry picked from commit d22d812da1c3b2a2f65f142ef5ed5fa07e8ab072) (cherry picked from commit 6a5a61bfab80116338f6a9c91ed7ec5f7b98923b) -… [View More]-- Modified: src/core/xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/dd09c233417129694ffb7481b03d465… Patch: https://github.com/kamailio/kamailio/commit/dd09c233417129694ffb7481b03d465… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index e27c07bd6f..5f160a1ceb 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -106,7 +106,7 @@ static sr_xavp_t *xavp_new_value(str *name, sr_xval_t *val) int size; unsigned int id; - if(name==NULL || name->s==NULL || val==NULL) + if(name==NULL || name->s==NULL || name->len<=0 || val==NULL) return NULL; id = get_hash1_raw(name->s, name->len); @@ -427,7 +427,7 @@ static int xavp_rm_internal(str *name, sr_xavp_t **head, int idx) int n=0; int count=0; - if(name==NULL || name->s==NULL) + if(name==NULL || name->s==NULL || name->len<=0) return 0; id = get_hash1_raw(name->s, name->len); @@ -498,7 +498,7 @@ int xavp_count(str *name, sr_xavp_t **start) unsigned int id; int n = 0; - if(name==NULL || name->s==NULL) + if(name==NULL || name->s==NULL || name->len<=0) return -1; id = get_hash1_raw(name->s, name->len); @@ -865,7 +865,7 @@ sr_xavp_t *xavp_extract(str *name, sr_xavp_t **list) sr_xavp_t *prv = 0; unsigned int id; - if(name==NULL || name->s==NULL) { + if(name==NULL || name->s==NULL || name->len<=0) { if(list!=NULL) { avp = *list; if(avp!=NULL) { @@ -1157,7 +1157,7 @@ static sr_xavp_t *xavu_get_internal(str *name, sr_xavp_t **list, sr_xavp_t **prv sr_xavp_t *avu; unsigned int id; - if(name==NULL || name->s==NULL) { + if(name==NULL || name->s==NULL || name->len<=0) { return NULL; } @@ -1235,7 +1235,7 @@ int xavu_rm_by_name(str *name, sr_xavp_t **head) unsigned int id; - if(name==NULL || name->s==NULL) { + if(name==NULL || name->s==NULL || name->len<=0) { return -1; } @@ -1466,7 +1466,7 @@ static sr_xavp_t *xavi_new_value(str *name, sr_xval_t *val) int size; unsigned int id; - if(name==NULL || name->s==NULL || val==NULL) + if(name==NULL || name->s==NULL || name->len<=0 || val==NULL) return NULL; id = get_hash1_case_raw(name->s, name->len); @@ -1699,7 +1699,7 @@ static sr_xavp_t *xavi_get_internal(str *name, sr_xavp_t **list, int idx, sr_xav unsigned int id; int n = 0; - if(name==NULL || name->s==NULL) + if(name==NULL || name->s==NULL || name->len<=0) return NULL; id = get_hash1_case_raw(name->s, name->len); @@ -1826,7 +1826,7 @@ static int xavi_rm_internal(str *name, sr_xavp_t **head, int idx) int n=0; int count=0; - if(name==NULL || name->s==NULL) + if(name==NULL || name->s==NULL || name->len<=0) return 0; id = get_hash1_case_raw(name->s, name->len); @@ -1909,7 +1909,7 @@ int xavi_count(str *name, sr_xavp_t **start) unsigned int id; int n = 0; - if(name==NULL || name->s==NULL) + if(name==NULL || name->s==NULL || name->len<=0) return -1; id = get_hash1_case_raw(name->s, name->len); @@ -2202,7 +2202,7 @@ sr_xavp_t *xavi_extract(str *name, sr_xavp_t **list) sr_xavp_t *prv = 0; unsigned int id; - if(name==NULL || name->s==NULL) { + if(name==NULL || name->s==NULL || name->len<=0) { if(list!=NULL) { avi = *list; if(avi!=NULL) { [View Less]

1 0

git:5.4:0675c3eb: presence: set correct type for local_log_facility modparam
by Daniel-Constantin Mierla 26 May '21

26 May '21

Module: kamailio Branch: 5.4 Commit: 0675c3eb0fa95e19532cf812585f1eb021829dbc URL: https://github.com/kamailio/kamailio/commit/0675c3eb0fa95e19532cf812585f1eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-26T08:28:43+02:00 presence: set correct type for local_log_facility modparam (cherry picked from commit 5f4662a95a97d5224bf03745a9a354a41925706c) (cherry picked from commit … [View More]

1 0

git:5.4:1b517a7e: dialog: ignore 408 on keepalive with cseq 0
by Daniel-Constantin Mierla 26 May '21

26 May '21

Module: kamailio Branch: 5.4 Commit: 1b517a7e560f20331aa94accca813825e0e0ff0b URL: https://github.com/kamailio/kamailio/commit/1b517a7e560f20331aa94accca81382… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-26T08:28:19+02:00 dialog: ignore 408 on keepalive with cseq 0 - some UAs do not reply at all (cherry picked from commit 7aa8056a5e3a9804133cb9ff79640d8116be63da) (cherry picked from commit … [View More]

1 0

git:5.4:078c6f86: tls: declare variable based on SSL_CTX_set_ecdh_auto
by Daniel-Constantin Mierla 26 May '21

26 May '21

Module: kamailio Branch: 5.4 Commit: 078c6f861fc52c28546dae5ce335002e5d5df99f URL: https://github.com/kamailio/kamailio/commit/078c6f861fc52c28546dae5ce335002… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-26T08:26:26+02:00 tls: declare variable based on SSL_CTX_set_ecdh_auto - fix unused variable warning introduced in previous commit (cherry picked from commit … [View More]

1 0

git:5.4:cd8a871c: msrp: destroy str array on error
by Daniel-Constantin Mierla 26 May '21

26 May '21

Module: kamailio Branch: 5.4 Commit: cd8a871c5a4c6446eddc48bd89bfe5cde89a6c21 URL: https://github.com/kamailio/kamailio/commit/cd8a871c5a4c6446eddc48bd89bfe5c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-26T08:26:05+02:00 msrp: destroy str array on error - some code reformatting (cherry picked from commit 4695b48b23e22135049f67a6ef362e933a0cf337) (cherry picked from commit … [View More]33cf417e59b4c7f0e45b6258644bae364ad2e912) --- Modified: src/modules/msrp/msrp_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/cd8a871c5a4c6446eddc48bd89bfe5c… Patch: https://github.com/kamailio/kamailio/commit/cd8a871c5a4c6446eddc48bd89bfe5c… --- diff --git a/src/modules/msrp/msrp_parser.c b/src/modules/msrp/msrp_parser.c index 7defaf9353..c701d6a6ca 100644 --- a/src/modules/msrp/msrp_parser.c +++ b/src/modules/msrp/msrp_parser.c @@ -610,7 +610,7 @@ msrp_hdr_t *msrp_get_hdr_by_id(msrp_frame_t *mf, int hdrid) /** * */ -int msrp_explode_str(str **arr, str *in, str *del) +int msrp_explode_str(str_array_t *arr, str *in, str *del) { str *larr; int i; @@ -633,20 +633,20 @@ int msrp_explode_str(str **arr, str *in, str *del) } n++; - larr = pkg_malloc(n * sizeof(str)); + larr = pkg_mallocxz(n * sizeof(str)); if(larr==NULL) { LM_ERR("no more pkg\n"); return -1; } - memset(larr, 0, n * sizeof(str)); k = 0; if(n==1) { larr[k].s = in->s; larr[k].len = in->len; - *arr = larr; + arr->list = larr; + arr->size = n; return n; } @@ -657,19 +657,23 @@ int msrp_explode_str(str **arr, str *in, str *del) { if(in->s[i]==del->s[j]) { - if(k<n) + if(k<n) { larr[k].len = in->s + i - larr[k].s; + } k++; - if(k<n) + if(k<n) { larr[k].s = in->s + i + 1; + } break; } } } - if(k<n) + if(k<n) { larr[k].len = in->s + i - larr[k].s; + } - *arr = larr; + arr->list = larr; + arr->size = n; return n; } @@ -677,7 +681,7 @@ int msrp_explode_str(str **arr, str *in, str *del) /** * */ -int msrp_explode_strz(str **arr, str *in, char *del) +int msrp_explode_strz(str_array_t *arr, str *in, char *del) { str s; @@ -693,7 +697,7 @@ void msrp_str_array_destroy(void *data) return; arr = (str_array_t*)data; if(arr->list!=NULL) - pkg_free(arr->list); + pkg_free(arr->list); pkg_free(arr); } @@ -705,20 +709,19 @@ int msrp_parse_hdr_uri_list(msrp_hdr_t *hdr) str_array_t *arr; str s; - arr = pkg_malloc(sizeof(str_array_t)); + arr = pkg_mallocxz(sizeof(str_array_t)); if(arr==NULL) { LM_ERR("no more pkg\n"); return -1; } - memset(arr, 0, sizeof(str_array_t)); s = hdr->body; trim(&s); - arr->size = msrp_explode_strz(&arr->list, &s, " "); - if(arr->size<0) + if(msrp_explode_strz(arr, &s, " ")<0) { LM_ERR("failed to explode\n"); + msrp_str_array_destroy(arr); return -1; } hdr->parsed.flags |= MSRP_DATA_SET; [View Less]

1 0

git:5.4:1142d547: [tls] Don't use OpenSSL<1.0.2 fallback on 1.1+
by Daniel-Constantin Mierla 26 May '21

26 May '21

Module: kamailio Branch: 5.4 Commit: 1142d5470d40801743af2fd9e27213bae6c394f4 URL: https://github.com/kamailio/kamailio/commit/1142d5470d40801743af2fd9e27213b… Author: SPChan <shihping.chan(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-26T08:25:25+02:00 [tls] Don't use OpenSSL<1.0.2 fallback on 1.1+ Address GH #2716. Also see https://bugs.python.org/issue29697. (cherry picked from commit 27904530d1f8efd26e2b96fa5f18a3aad887919b) (cherry … [View More]

1 0

git:5.4:bde591dc: msrp: check return code for str explode
by Daniel-Constantin Mierla 26 May '21

26 May '21

Module: kamailio Branch: 5.4 Commit: bde591dc9507eaea0b744112d49ea01fbdf8f555 URL: https://github.com/kamailio/kamailio/commit/bde591dc9507eaea0b744112d49ea01… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-26T08:24:32+02:00 msrp: check return code for str explode (cherry picked from commit addb6a88d0266a0bb0545077fb0b5b8a3fdcca8e) (cherry picked from commit e55ecc6412997b55569f3b626a681eae0ca312df) -… [View More]

1 0

git:5.4:cf1f5043: dispatcher: docs - set xmlns for include tags
by Daniel-Constantin Mierla 26 May '21

26 May '21

Module: kamailio Branch: 5.4 Commit: cf1f5043fd346a1106071cad2f5e294ce7e32fd9 URL: https://github.com/kamailio/kamailio/commit/cf1f5043fd346a1106071cad2f5e294… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-26T08:23:01+02:00 dispatcher: docs - set xmlns for include tags (cherry picked from commit 3f25ef01c5cc3adb02dd1bfecdfd4c3ce80cef47) (cherry picked from commit … [View More]6b9ecb0856a881144546fea6d3cbd8a3dc668b81) --- Modified: src/modules/dispatcher/doc/dispatcher.xml Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/cf1f5043fd346a1106071cad2f5e294… Patch: https://github.com/kamailio/kamailio/commit/cf1f5043fd346a1106071cad2f5e294… --- diff --git a/src/modules/dispatcher/doc/dispatcher.xml b/src/modules/dispatcher/doc/dispatcher.xml index 3888e5f281..af040e737d 100644 --- a/src/modules/dispatcher/doc/dispatcher.xml +++ b/src/modules/dispatcher/doc/dispatcher.xml @@ -6,12 +6,9 @@ <!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml"> %docentities; -<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod" > -%xinclude; - ]> -<book xmlns:xi="http://www.w3.org/2001/XInclude"> +<book> <bookinfo> <title>DISPATCHER Module</title> <productname class="trade">&kamailioname;</productname> @@ -97,7 +94,7 @@ </bookinfo> <toc/> - <xi:include href="dispatcher_admin.xml"/> - <xi:include href="dispatcher_faq.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dispatcher_admin.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dispatcher_faq.xml"/> </book> diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 11fff9c7d6..30f32ca038 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1,18 +1,15 @@ <?xml version="1.0" encoding='ISO-8859-1'?> -<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ - +  <!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml"> %docentities; -<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod" > -%xinclude; - ]>  -<chapter xmlns:xi="http://www.w3.org/2001/XInclude"> +<chapter> <title>&adminguide;</title> @@ -2170,7 +2167,7 @@ setid(int) destination(sip uri) flags(int,opt) priority(int,opt) attrs(str,opt) <title>dispatcher list file</title> <programlisting format="linespecific"> ... -<xi:include href="dispatcher.list" parse="text"/> +<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dispatcher.list" parse="text"/> ... </programlisting> </example> @@ -2186,7 +2183,7 @@ setid(int) destination(sip uri) flags(int,opt) priority(int,opt) attrs(str,opt) <title>&kamailio; config script - sample dispatcher usage</title> <programlisting format="linespecific"> ... -<xi:include href="dispatcher.cfg" parse="text"/> +<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dispatcher.cfg" parse="text"/> ... </programlisting> </example> [View Less]

1 0

git:5.4:b95e319d: core/mem: q_malloc - use #else with DBG_QM_MALLOC for debug on freed fragments
by Daniel-Constantin Mierla 26 May '21

26 May '21

Module: kamailio Branch: 5.4 Commit: b95e319d006a38fcc6385d704de82e553f7c2236 URL: https://github.com/kamailio/kamailio/commit/b95e319d006a38fcc6385d704de82e5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-26T08:23:45+02:00 core/mem: q_malloc - use #else with DBG_QM_MALLOC for debug on freed fragments (cherry picked from commit 764d5be0c44036bb4b86f841588fb0df3b4bb834) (cherry picked from commit … [View More]

1 0

git:5.5:b62a773c: pike: fixed regression
by Daniel-Constantin Mierla 26 May '21

26 May '21

Module: kamailio Branch: 5.5 Commit: b62a773c8f0c1daf1aa3d1cd57845d414eea5bac URL: https://github.com/kamailio/kamailio/commit/b62a773c8f0c1daf1aa3d1cd57845d4… Author: Boris Korzun <korzun(a)miatel.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-26T08:14:54+02:00 pike: fixed regression - removed unnecessary NULL-return from mark_node() after previous commit (cherry picked from commit 79fbb7c6df5d4c742b1283b752c2df0f51e77f09) --- Modified: src/modules/… [View More]

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
29
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 2021