sr-dev November 2015

sr-dev@lists.kamailio.org

27 participants
315 discussions

git:master:99a60151: dmq_usrloc: documentation for sync parameter
by Daniel-Constantin Mierla 20 Nov '15

20 Nov '15

Module: kamailio Branch: master Commit: 99a6015165d161c4b99c72d81497e3496b387768 URL: https://github.com/kamailio/kamailio/commit/99a6015165d161c4b99c72d81497e34… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-20T12:33:19+01:00 dmq_usrloc: documentation for sync parameter --- Modified: modules/dmq_usrloc/README Modified: modules/dmq_usrloc/doc/dmq_usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/99a6015165d161c4b99c72d81497e34… Patch: https://github.com/kamailio/kamailio/commit/99a6015165d161c4b99c72d81497e34… --- diff --git a/modules/dmq_usrloc/README b/modules/dmq_usrloc/README index c22b9fa..db19233 100644 --- a/modules/dmq_usrloc/README +++ b/modules/dmq_usrloc/README @@ -27,10 +27,12 @@ Andrey Rybkin 3. Parameters 3.1. enable (int) + 3.2. sync (int) List of Examples 1.1. Set enable parameter + 1.2. Set sync parameter Chapter 1. Admin Guide @@ -44,6 +46,7 @@ Chapter 1. Admin Guide 3. Parameters 3.1. enable (int) + 3.2. sync (int) 1. Overview @@ -63,6 +66,7 @@ Chapter 1. Admin Guide 3. Parameters 3.1. enable (int) + 3.2. sync (int) 3.1. enable (int) @@ -77,3 +81,17 @@ Chapter 1. Admin Guide ... modparam("dmq_usrloc", "enable", 1) ... + +3.2. sync (int) + + The parameter controls whetner to request synchronization of all usrloc + records at startup. The value can be: + * 0 - disabled + * 1 - enabled + + Default value is 1. + + Example 1.2. Set sync parameter +... +modparam("dmq_usrloc", "sync", 0) +... diff --git a/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml b/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml index abd529d..a7da61d 100644 --- a/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml +++ b/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml @@ -75,6 +75,39 @@ modparam("dmq_usrloc", "enable", 1) </programlisting> </example> </section> + <section id="usrloc_dmq.p.sync"> + <title><varname>sync</varname> (int)</title> + <para> + The parameter controls whetner to request synchronization of all + usrloc records at startup. + The value can be: + <itemizedlist> + <listitem> + <para> + 0 - disabled + </para> + </listitem> + <listitem> + <para> + 1 - enabled + </para> + </listitem> + </itemizedlist> + </para> + <para> + <emphasis> + Default value is 1. + </emphasis> + </para> + <example> + <title>Set <varname>sync</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("dmq_usrloc", "sync", 0) +... +</programlisting> + </example> + </section> </section> </chapter>

1 0

git:master:5efe3229: dmq_usrloc: new param sync - control sync'ing all contacts at startup
by Daniel-Constantin Mierla 20 Nov '15

20 Nov '15

Module: kamailio Branch: master Commit: 5efe3229da3c98ed2bd531c6c9eb712bdbd9ea67 URL: https://github.com/kamailio/kamailio/commit/5efe3229da3c98ed2bd531c6c9eb712… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-20T12:33:19+01:00 dmq_usrloc: new param sync - control sync'ing all contacts at startup - default 1 - require sync'ing of all contacts at startup - set to 0 to disable --- Modified: modules/dmq_usrloc/dmq_usrloc.c Modified: modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/5efe3229da3c98ed2bd531c6c9eb712… Patch: https://github.com/kamailio/kamailio/commit/5efe3229da3c98ed2bd531c6c9eb712… --- diff --git a/modules/dmq_usrloc/dmq_usrloc.c b/modules/dmq_usrloc/dmq_usrloc.c index cd5fedd..c3ec54d 100644 --- a/modules/dmq_usrloc/dmq_usrloc.c +++ b/modules/dmq_usrloc/dmq_usrloc.c @@ -35,6 +35,7 @@ static int mod_init(void); static int child_init(int); int dmq_usrloc_enable = 0; +int _dmq_usrloc_sync = 1; usrloc_api_t dmq_ul; @@ -42,6 +43,7 @@ MODULE_VERSION static param_export_t params[] = { {"enable", INT_PARAM, &dmq_usrloc_enable}, + {"sync", INT_PARAM, &_dmq_usrloc_sync}, {0, 0, 0} }; diff --git a/modules/dmq_usrloc/usrloc_sync.c b/modules/dmq_usrloc/usrloc_sync.c index 2246c36..d1c534f 100644 --- a/modules/dmq_usrloc/usrloc_sync.c +++ b/modules/dmq_usrloc/usrloc_sync.c @@ -43,6 +43,8 @@ int usrloc_dmq_send_contact(ucontact_t* ptr, str aor, int action, dmq_node_t* no #define MAX_AOR_LEN 256 +extern int _dmq_usrloc_sync; + static int add_contact(str aor, ucontact_info_t* ci) { urecord_t* r; @@ -425,6 +427,10 @@ int usrloc_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* int usrloc_dmq_request_sync() { srjson_doc_t jdoc; + + if(_dmq_usrloc_sync==0) + return 0; + LM_DBG("requesting sync from dmq peers\n"); srjson_InitDoc(&jdoc, NULL);

1 0

git:4.3:2fe732bd: tm: set next hop as dst_uri for appended branches
by Federico Cabiddu 20 Nov '15

20 Nov '15

Module: kamailio Branch: 4.3 Commit: 2fe732bd12fd45d2845626589b255a9d78acd7d1 URL: https://github.com/kamailio/kamailio/commit/2fe732bd12fd45d2845626589b255a9… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2015-11-20T11:16:37+01:00 tm: set next hop as dst_uri for appended branches (cherry picked from commit 4d122e15f4599010000f6e5d2e60e9bc13b2281a) --- Modified: modules/tm/t_append_branches.c --- Diff: https://github.com/kamailio/kamailio/commit/2fe732bd12fd45d2845626589b255a9… Patch: https://github.com/kamailio/kamailio/commit/2fe732bd12fd45d2845626589b255a9… --- diff --git a/modules/tm/t_append_branches.c b/modules/tm/t_append_branches.c index 92f73fe..7a928f7 100644 --- a/modules/tm/t_append_branches.c +++ b/modules/tm/t_append_branches.c @@ -140,7 +140,7 @@ int t_append_branches(void) { new_branch=add_uac( t, &faked_req, &current_uri, (dst_uri.len) ? (&dst_uri) : &current_uri, &path, 0, si, faked_req.fwd_send_flags, - PROTO_NONE, (dst_uri.len)?-1:UAC_SKIP_BR_DST_F, &instance, + PROTO_NONE, (dst_uri.len)?0:UAC_SKIP_BR_DST_F, &instance, &ruid, &location_ua); LM_DBG("added branch [%.*s] with ruid [%.*s]\n", current_uri.len, current_uri.s, ruid.len, ruid.s);

1 0

git:master:4d122e15: tm: set next hop as dst_uri for appended branches
by Federico Cabiddu 20 Nov '15

20 Nov '15

Module: kamailio Branch: master Commit: 4d122e15f4599010000f6e5d2e60e9bc13b2281a URL: https://github.com/kamailio/kamailio/commit/4d122e15f4599010000f6e5d2e60e9b… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2015-11-20T11:13:40+01:00 tm: set next hop as dst_uri for appended branches --- Modified: modules/tm/t_append_branches.c --- Diff: https://github.com/kamailio/kamailio/commit/4d122e15f4599010000f6e5d2e60e9b… Patch: https://github.com/kamailio/kamailio/commit/4d122e15f4599010000f6e5d2e60e9b… --- diff --git a/modules/tm/t_append_branches.c b/modules/tm/t_append_branches.c index 65073b1..f38a0a2 100644 --- a/modules/tm/t_append_branches.c +++ b/modules/tm/t_append_branches.c @@ -140,7 +140,7 @@ int t_append_branches(void) { new_branch=add_uac( t, &faked_req, &current_uri, (dst_uri.len) ? (&dst_uri) : &current_uri, &path, 0, si, faked_req.fwd_send_flags, - PROTO_NONE, (dst_uri.len)?-1:UAC_SKIP_BR_DST_F, &instance, + PROTO_NONE, (dst_uri.len)?0:UAC_SKIP_BR_DST_F, &instance, &ruid, &location_ua); LM_DBG("added branch [%.*s] with ruid [%.*s]\n", current_uri.len, current_uri.s, ruid.len, ruid.s);

1 0

Kamailio is a SIP Server or a SIP Stack
by Singh, Trilochan 20 Nov '15

20 Nov '15

Hi, I have a query regarding Kamailio SIP Server. It's a server or stack? In website it's mentioned as SIP server but still I want to confirm it from dev side. Regards, Trilochan Singh

2 2

[kamailio] rtp_proxy 'r' flag (#405)
by Dmitri Savolainen 19 Nov '15

19 Nov '15

Inspired by commit https://github.com/kamailio/kamailio/commit/ac31eb11cc4b194b2d7e9dddff63fd0… in rtpproxy doc module ``` r - flags that IP address in SDP should be trusted. Without this flag, rtpproxy ignores address in the SDP and uses source address of the SIP message as media address which is passed to the RTP proxy. ``` But it is possible to send media to SDP IP without this flag. Here a little more details https://github.com/sippy/rtpproxy/issues/34 --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/405

2 2

git:master:b056aed3: modules/ims_qos: do not free auth session on failure to send STR
by jaybeepee 19 Nov '15

19 Nov '15

Module: kamailio Branch: master Commit: b056aed3db849d54ad5b7cd04e016bbd969a57c6 URL: https://github.com/kamailio/kamailio/commit/b056aed3db849d54ad5b7cd04e016bb… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-11-19T17:32:17+02:00 modules/ims_qos: do not free auth session on failure to send STR --- Modified: modules/ims_qos/rx_str.c --- Diff: https://github.com/kamailio/kamailio/commit/b056aed3db849d54ad5b7cd04e016bb… Patch: https://github.com/kamailio/kamailio/commit/b056aed3db849d54ad5b7cd04e016bb… --- diff --git a/modules/ims_qos/rx_str.c b/modules/ims_qos/rx_str.c index 2451266..136ea56 100644 --- a/modules/ims_qos/rx_str.c +++ b/modules/ims_qos/rx_str.c @@ -106,7 +106,8 @@ int rx_send_str(str *rx_session_id) { // If we are in DISCON is because an STR was already sent // so just wait for STA or for Grace Timout to happen LM_DBG("Hmmm, auth session already in disconnected state\n"); - goto error; + cdpb.AAASessionsUnlock(auth->hash); + CSCF_RETURN_FALSE; } LM_DBG("Creating STR\n");

1 0

git:4.3:2d1b6dcf: core: NULL checks for ut.h
by Stefan Mititelu 19 Nov '15

19 Nov '15

Module: kamailio Branch: 4.3 Commit: 2d1b6dcf6b00291e6d81b1a847718b21f80c3d16 URL: https://github.com/kamailio/kamailio/commit/2d1b6dcf6b00291e6d81b1a847718b2… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-11-19T16:13:11+02:00 core: NULL checks for ut.h Add some NULL checks for shm/pkg dup functions and few others. (cherry-picked from commit 24999a5dbf7d986942479c0670158748c263a3cd) --- Modified: ut.h --- Diff: https://github.com/kamailio/kamailio/commit/2d1b6dcf6b00291e6d81b1a847718b2… Patch: https://github.com/kamailio/kamailio/commit/2d1b6dcf6b00291e6d81b1a847718b2… --- diff --git a/ut.h b/ut.h index abf635e..8d4f01e 100644 --- a/ut.h +++ b/ut.h @@ -170,8 +170,7 @@ static char fourbits2char[16] = { '0', '1', '2', '3', '4', '5', /* converts a str to an u. short, returns the u. short and sets *err on * error and if err!=null */ -static inline unsigned short str2s(const char* s, unsigned int len, - int *err) +static inline unsigned short str2s(const char* s, unsigned int len, int *err) { unsigned short ret; int i; @@ -619,6 +618,10 @@ static inline void strlower(str* _s) { int i; + if (_s == NULL) return ; + if (_s->len < 0) return ; + if (_s->s == NULL) return ; + for(i = 0; i < _s->len; i++) { _s->s[i] = tolower(_s->s[i]); } @@ -631,7 +634,12 @@ static inline void strlower(str* _s) static inline int str2int(str* _s, unsigned int* _r) { int i; - + + if (_s == NULL) return -1; + if (_r == NULL) return -1; + if (_s->len < 0) return -1; + if (_s->s == NULL) return -1; + *_r = 0; for(i = 0; i < _s->len; i++) { if ((_s->s[i] >= '0') && (_s->s[i] <= '9')) { @@ -641,7 +649,7 @@ static inline int str2int(str* _s, unsigned int* _r) return -1; } } - + return 0; } @@ -653,7 +661,10 @@ static inline int str2sint(str* _s, int* _r) int i; int sign; - if (_s->len == 0) return -1; + if (_s == NULL) return -1; + if (_r == NULL) return -1; + if (_s->len < 0) return -1; + if (_s->s == NULL) return -1; *_r = 0; sign = 1; @@ -688,14 +699,41 @@ static inline int str2sint(str* _s, int* _r) */ static inline int shm_str_dup(str* dst, const str* src) { - dst->s = (char*)shm_malloc(src->len); - if (!dst->s) { + /* NULL checks */ + if (dst == NULL || src == NULL) { + LM_ERR("NULL src or dst\n"); + return -1; + } + + /** + * fallback actions: + * - dst->len=0 + * - dst->s is allocated sizeof(void*) size + * - return 0 (i.e. success) + */ + + /* fallback checks */ + if (src->len < 0 || src->s == NULL) { + LM_WARN("shm_str_dup fallback; dup called for src->s == NULL or src->len < 0\n"); + dst->len = 0; + } else { + dst->len = src->len; + } + + dst->s = (char*)shm_malloc(dst->len); + if (dst->s == NULL) { SHM_MEM_ERROR; return -1; } - memcpy(dst->s, src->s, src->len); - dst->len = src->len; + /* avoid memcpy from NULL source - undefined behaviour */ + if (src->s == NULL) { + LM_WARN("shm_str_dup fallback; skip memcpy for src->s == NULL\n"); + return 0; + } + + memcpy(dst->s, src->s, dst->len); + return 0; } #endif /* SHM_MEM */ @@ -710,15 +748,41 @@ static inline int shm_str_dup(str* dst, const str* src) */ static inline int pkg_str_dup(str* dst, const str* src) { - dst->s = (char*)pkg_malloc(src->len); - if (dst->s==NULL) - { + /* NULL checks */ + if (dst == NULL || src == NULL) { + LM_ERR("NULL src or dst\n"); + return -1; + } + + /** + * fallback actions: + * - dst->len=0 + * - dst->s is allocated sizeof(void*) size + * - return 0 (i.e. success) + */ + + /* fallback checks */ + if (src->len < 0 || src->s == NULL) { + LM_WARN("pkg_str_dup fallback; dup called for src->s == NULL or src->len < 0\n"); + dst->len = 0; + } else { + dst->len = src->len; + } + + dst->s = (char*)pkg_malloc(dst->len); + if (dst->s == NULL) { PKG_MEM_ERROR; return -1; } - memcpy(dst->s, src->s, src->len); - dst->len = src->len; + /* avoid memcpy from NULL source - undefined behaviour */ + if (src->s == NULL) { + LM_WARN("pkg_str_dup fallback; skip memcpy for src->s == NULL\n"); + return 0; + } + + memcpy(dst->s, src->s, dst->len); + return 0; }

1 0

git:4.2:c2b2d185: core: NULL checks for ut.h
by Stefan Mititelu 19 Nov '15

19 Nov '15

Module: kamailio Branch: 4.2 Commit: c2b2d1855020caee38541eb77d66f072a425dfe9 URL: https://github.com/kamailio/kamailio/commit/c2b2d1855020caee38541eb77d66f07… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-11-19T16:10:35+02:00 core: NULL checks for ut.h Add some NULL checks for shm/pkg dup functions and few others. (cherry-picked from commit 24999a5dbf7d986942479c0670158748c263a3cd) --- Modified: ut.h --- Diff: https://github.com/kamailio/kamailio/commit/c2b2d1855020caee38541eb77d66f07… Patch: https://github.com/kamailio/kamailio/commit/c2b2d1855020caee38541eb77d66f07… --- diff --git a/ut.h b/ut.h index 3c4a614..b4e887e 100644 --- a/ut.h +++ b/ut.h @@ -189,8 +189,7 @@ static char fourbits2char[16] = { '0', '1', '2', '3', '4', '5', /* converts a str to an u. short, returns the u. short and sets *err on * error and if err!=null */ -static inline unsigned short str2s(const char* s, unsigned int len, - int *err) +static inline unsigned short str2s(const char* s, unsigned int len, int *err) { unsigned short ret; int i; @@ -638,6 +637,10 @@ static inline void strlower(str* _s) { int i; + if (_s == NULL) return ; + if (_s->len < 0) return ; + if (_s->s == NULL) return ; + for(i = 0; i < _s->len; i++) { _s->s[i] = tolower(_s->s[i]); } @@ -650,7 +653,12 @@ static inline void strlower(str* _s) static inline int str2int(str* _s, unsigned int* _r) { int i; - + + if (_s == NULL) return -1; + if (_r == NULL) return -1; + if (_s->len < 0) return -1; + if (_s->s == NULL) return -1; + *_r = 0; for(i = 0; i < _s->len; i++) { if ((_s->s[i] >= '0') && (_s->s[i] <= '9')) { @@ -660,7 +668,7 @@ static inline int str2int(str* _s, unsigned int* _r) return -1; } } - + return 0; } @@ -672,7 +680,10 @@ static inline int str2sint(str* _s, int* _r) int i; int sign; - if (_s->len == 0) return -1; + if (_s == NULL) return -1; + if (_r == NULL) return -1; + if (_s->len < 0) return -1; + if (_s->s == NULL) return -1; *_r = 0; sign = 1; @@ -707,14 +718,41 @@ static inline int str2sint(str* _s, int* _r) */ static inline int shm_str_dup(str* dst, const str* src) { - dst->s = (char*)shm_malloc(src->len); - if (!dst->s) { + /* NULL checks */ + if (dst == NULL || src == NULL) { + LM_ERR("NULL src or dst\n"); + return -1; + } + + /** + * fallback actions: + * - dst->len=0 + * - dst->s is allocated sizeof(void*) size + * - return 0 (i.e. success) + */ + + /* fallback checks */ + if (src->len < 0 || src->s == NULL) { + LM_WARN("shm_str_dup fallback; dup called for src->s == NULL or src->len < 0\n"); + dst->len = 0; + } else { + dst->len = src->len; + } + + dst->s = (char*)shm_malloc(dst->len); + if (dst->s == NULL) { SHM_MEM_ERROR; return -1; } - memcpy(dst->s, src->s, src->len); - dst->len = src->len; + /* avoid memcpy from NULL source - undefined behaviour */ + if (src->s == NULL) { + LM_WARN("shm_str_dup fallback; skip memcpy for src->s == NULL\n"); + return 0; + } + + memcpy(dst->s, src->s, dst->len); + return 0; } #endif /* SHM_MEM */ @@ -729,15 +767,41 @@ static inline int shm_str_dup(str* dst, const str* src) */ static inline int pkg_str_dup(str* dst, const str* src) { - dst->s = (char*)pkg_malloc(src->len); - if (dst->s==NULL) - { + /* NULL checks */ + if (dst == NULL || src == NULL) { + LM_ERR("NULL src or dst\n"); + return -1; + } + + /** + * fallback actions: + * - dst->len=0 + * - dst->s is allocated sizeof(void*) size + * - return 0 (i.e. success) + */ + + /* fallback checks */ + if (src->len < 0 || src->s == NULL) { + LM_WARN("pkg_str_dup fallback; dup called for src->s == NULL or src->len < 0\n"); + dst->len = 0; + } else { + dst->len = src->len; + } + + dst->s = (char*)pkg_malloc(dst->len); + if (dst->s == NULL) { PKG_MEM_ERROR; return -1; } - memcpy(dst->s, src->s, src->len); - dst->len = src->len; + /* avoid memcpy from NULL source - undefined behaviour */ + if (src->s == NULL) { + LM_WARN("pkg_str_dup fallback; skip memcpy for src->s == NULL\n"); + return 0; + } + + memcpy(dst->s, src->s, dst->len); + return 0; }

1 0

git:4.1:4dce9a6e: core: NULL checks for ut.h
by Stefan Mititelu 19 Nov '15

19 Nov '15

Module: kamailio Branch: 4.1 Commit: 4dce9a6e9e15a6aaa6cf31a563c4e5684a0ddf7a URL: https://github.com/kamailio/kamailio/commit/4dce9a6e9e15a6aaa6cf31a563c4e56… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-11-19T16:07:50+02:00 core: NULL checks for ut.h Add some NULL checks for shm/pkg dup functions and few others. (cherry-picked from commit 24999a5dbf7d986942479c0670158748c263a3cd) --- Modified: ut.h --- Diff: https://github.com/kamailio/kamailio/commit/4dce9a6e9e15a6aaa6cf31a563c4e56… Patch: https://github.com/kamailio/kamailio/commit/4dce9a6e9e15a6aaa6cf31a563c4e56… --- diff --git a/ut.h b/ut.h index 8f04736..92dd8e9 100644 --- a/ut.h +++ b/ut.h @@ -189,8 +189,7 @@ static char fourbits2char[16] = { '0', '1', '2', '3', '4', '5', /* converts a str to an u. short, returns the u. short and sets *err on * error and if err!=null */ -static inline unsigned short str2s(const char* s, unsigned int len, - int *err) +static inline unsigned short str2s(const char* s, unsigned int len, int *err) { unsigned short ret; int i; @@ -639,6 +638,10 @@ static inline void strlower(str* _s) { int i; + if (_s == NULL) return ; + if (_s->len < 0) return ; + if (_s->s == NULL) return ; + for(i = 0; i < _s->len; i++) { _s->s[i] = tolower(_s->s[i]); } @@ -651,7 +654,12 @@ static inline void strlower(str* _s) static inline int str2int(str* _s, unsigned int* _r) { int i; - + + if (_s == NULL) return -1; + if (_r == NULL) return -1; + if (_s->len < 0) return -1; + if (_s->s == NULL) return -1; + *_r = 0; for(i = 0; i < _s->len; i++) { if ((_s->s[i] >= '0') && (_s->s[i] <= '9')) { @@ -661,7 +669,7 @@ static inline int str2int(str* _s, unsigned int* _r) return -1; } } - + return 0; } @@ -673,7 +681,10 @@ static inline int str2sint(str* _s, int* _r) int i; int sign; - if (_s->len == 0) return -1; + if (_s == NULL) return -1; + if (_r == NULL) return -1; + if (_s->len < 0) return -1; + if (_s->s == NULL) return -1; *_r = 0; sign = 1; @@ -708,14 +719,41 @@ static inline int str2sint(str* _s, int* _r) */ static inline int shm_str_dup(str* dst, const str* src) { - dst->s = (char*)shm_malloc(src->len); - if (!dst->s) { + /* NULL checks */ + if (dst == NULL || src == NULL) { + LM_ERR("NULL src or dst\n"); + return -1; + } + + /** + * fallback actions: + * - dst->len=0 + * - dst->s is allocated sizeof(void*) size + * - return 0 (i.e. success) + */ + + /* fallback checks */ + if (src->len < 0 || src->s == NULL) { + LM_WARN("shm_str_dup fallback; dup called for src->s == NULL or src->len < 0\n"); + dst->len = 0; + } else { + dst->len = src->len; + } + + dst->s = (char*)shm_malloc(dst->len); + if (dst->s == NULL) { SHM_MEM_ERROR; return -1; } - memcpy(dst->s, src->s, src->len); - dst->len = src->len; + /* avoid memcpy from NULL source - undefined behaviour */ + if (src->s == NULL) { + LM_WARN("shm_str_dup fallback; skip memcpy for src->s == NULL\n"); + return 0; + } + + memcpy(dst->s, src->s, dst->len); + return 0; } #endif /* SHM_MEM */ @@ -730,15 +768,41 @@ static inline int shm_str_dup(str* dst, const str* src) */ static inline int pkg_str_dup(str* dst, const str* src) { - dst->s = (char*)pkg_malloc(src->len); - if (dst->s==NULL) - { + /* NULL checks */ + if (dst == NULL || src == NULL) { + LM_ERR("NULL src or dst\n"); + return -1; + } + + /** + * fallback actions: + * - dst->len=0 + * - dst->s is allocated sizeof(void*) size + * - return 0 (i.e. success) + */ + + /* fallback checks */ + if (src->len < 0 || src->s == NULL) { + LM_WARN("pkg_str_dup fallback; dup called for src->s == NULL or src->len < 0\n"); + dst->len = 0; + } else { + dst->len = src->len; + } + + dst->s = (char*)pkg_malloc(dst->len); + if (dst->s == NULL) { PKG_MEM_ERROR; return -1; } - memcpy(dst->s, src->s, src->len); - dst->len = src->len; + /* avoid memcpy from NULL source - undefined behaviour */ + if (src->s == NULL) { + LM_WARN("pkg_str_dup fallback; skip memcpy for src->s == NULL\n"); + return 0; + } + + memcpy(dst->s, src->s, dst->len); + return 0; }

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2015