sr-dev November 2015

sr-dev@lists.kamailio.org

27 participants
316 discussions

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

git:master:9949f42c: core: ut.h
by Stefan Mititelu 19 Nov '15

19 Nov '15

Module: kamailio Branch: master Commit: 9949f42c9dedcb300ca6c99e53a3b171a6500c21 URL: https://github.com/kamailio/kamailio/commit/9949f42c9dedcb300ca6c99e53a3b17… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-11-19T16:02:03+02:00 core: ut.h Typo SHM_MEM_ERROR vs PKG_MEM_ERROR --- Modified: ut.h --- Diff: https://github.com/kamailio/kamailio/commit/9949f42c9dedcb300ca6c99e53a3b17… Patch: https://github.com/kamailio/kamailio/commit/9949f42c9dedcb300ca6c99e53a3b17… --- diff --git a/ut.h b/ut.h index 589bb28..8d4f01e 100644 --- a/ut.h +++ b/ut.h @@ -771,7 +771,7 @@ static inline int pkg_str_dup(str* dst, const str* src) dst->s = (char*)pkg_malloc(dst->len); if (dst->s == NULL) { - SHM_MEM_ERROR; + PKG_MEM_ERROR; return -1; }

1 0

git:master:ac31eb11: etc/kamailio.cfg: use flag 'r' for rtpproxy if ip in sdp is not private
by Daniel-Constantin Mierla 19 Nov '15

19 Nov '15

Module: kamailio Branch: master Commit: ac31eb11cc4b194b2d7e9dddff63fd074f456005 URL: https://github.com/kamailio/kamailio/commit/ac31eb11cc4b194b2d7e9dddff63fd0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-19T15:00:18+01:00 etc/kamailio.cfg: use flag 'r' for rtpproxy if ip in sdp is not private - skip learning mode, advertised media ip is routable --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/ac31eb11cc4b194b2d7e9dddff63fd0… Patch: https://github.com/kamailio/kamailio/commit/ac31eb11cc4b194b2d7e9dddff63fd0… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 7f5f3db..e48d729 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -784,7 +784,11 @@ route[NATMANAGE] { if (!(isflagset(FLT_NATS) || isbflagset(FLB_NATB))) return; - rtpproxy_manage("co"); + if(nat_uac_test("8")) { + rtpproxy_manage("co"); + } else { + rtpproxy_manage("cor"); + } if (is_request()) { if (!has_totag()) {

1 0

git:master:af449f25: Merge pull request #401 from smititelu/ut_sanity_checks
by Stefan Mititelu 19 Nov '15

19 Nov '15

Module: kamailio Branch: master Commit: af449f2509138c024b866c88063efce843bf6d86 URL: https://github.com/kamailio/kamailio/commit/af449f2509138c024b866c88063efce… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-11-19T15:51:59+02:00 Merge pull request #401 from smititelu/ut_sanity_checks core: NULL checks for ut.h --- Modified: ut.h --- Diff: https://github.com/kamailio/kamailio/commit/af449f2509138c024b866c88063efce… Patch: https://github.com/kamailio/kamailio/commit/af449f2509138c024b866c88063efce… --- diff --git a/ut.h b/ut.h index abf635e..589bb28 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) - { - PKG_MEM_ERROR; + /* 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) { + 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("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:master:24999a5d: core: NULL checks for ut.h
by Stefan Mititelu 19 Nov '15

19 Nov '15

Module: kamailio Branch: master Commit: 24999a5dbf7d986942479c0670158748c263a3cd URL: https://github.com/kamailio/kamailio/commit/24999a5dbf7d986942479c067015874… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-11-19T14:36:54+02:00 core: NULL checks for ut.h Add some NULL checks for shm/pkg dup functions and few others. --- Modified: ut.h --- Diff: https://github.com/kamailio/kamailio/commit/24999a5dbf7d986942479c067015874… Patch: https://github.com/kamailio/kamailio/commit/24999a5dbf7d986942479c067015874… --- diff --git a/ut.h b/ut.h index abf635e..589bb28 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) - { - PKG_MEM_ERROR; + /* 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) { + 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("pkg_str_dup fallback; skip memcpy for src->s == NULL\n"); + return 0; + } + + memcpy(dst->s, src->s, dst->len); + return 0; }

1 0

[kamailio] core: NULL checks for ut.h (#401)
by Stefan Mititelu 19 Nov '15

19 Nov '15

NULL checks for shm/pkg dup functions and few others. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/401 -- Commit Summary -- * core: NULL checks for ut.h -- File Changes -- M ut.h (75) -- Patch Links -- https://github.com/kamailio/kamailio/pull/401.patch https://github.com/kamailio/kamailio/pull/401.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/401

2 7

git:master:ea0b4e50: tm: use svpe fixup for t replicate uri param
by Daniel-Constantin Mierla 19 Nov '15

19 Nov '15

Module: kamailio Branch: master Commit: ea0b4e50f62f8a461b737882c383f17767851d3d URL: https://github.com/kamailio/kamailio/commit/ea0b4e50f62f8a461b737882c383f17… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-19T13:58:33+01:00 tm: use svpe fixup for t replicate uri param - the function expects it for getting the value --- Modified: modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/ea0b4e50f62f8a461b737882c383f17… Patch: https://github.com/kamailio/kamailio/commit/ea0b4e50f62f8a461b737882c383f17… --- diff --git a/modules/tm/tm.c b/modules/tm/tm.c index 0293a1c..ecca92e 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -319,7 +319,7 @@ static cmd_export_t cmds[]={ #endif {"t_replicate", w_t_replicate_uri, 0, 0, REQUEST_ROUTE}, - {"t_replicate", w_t_replicate_uri, 1, fixup_var_str_1, + {"t_replicate", w_t_replicate_uri, 1, fixup_spve_null, REQUEST_ROUTE}, {"t_replicate", w_t_replicate, 2, fixup_hostport2proxy, REQUEST_ROUTE},

1 0

[kamailio] db_postgres: fix compilation, NTOHLL and NTOHLL provided by OSX 10.10 (#404)
by Daniel Rus Morales 19 Nov '15

19 Nov '15

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/404 -- Commit Summary -- * Compilation fix for db_postgres, NTOHLL and NTOHLL supported by OSX 10.10 -- File Changes -- M .gitignore (2) M modules/db_postgres/pg_fld.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/404.patch https://github.com/kamailio/kamailio/pull/404.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/404

2 2

git:master:b37aa66f: db_postgress: fix compilation, NTOHLL and NTOHLL provided by OSX 10.10
by Daniel-Constantin Mierla 19 Nov '15

19 Nov '15

Module: kamailio Branch: master Commit: b37aa66fd1cf3fe99aae50adb89d4cfecf6d90d1 URL: https://github.com/kamailio/kamailio/commit/b37aa66fd1cf3fe99aae50adb89d4cf… Author: Daniel Rus Morales <danirus(a)eml.cc> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-19T13:44:08+01:00 db_postgress: fix compilation, NTOHLL and NTOHLL provided by OSX 10.10 --- Modified: modules/db_postgres/pg_fld.c --- Diff: https://github.com/kamailio/kamailio/commit/b37aa66fd1cf3fe99aae50adb89d4cf… Patch: https://github.com/kamailio/kamailio/commit/b37aa66fd1cf3fe99aae50adb89d4cf… --- diff --git a/modules/db_postgres/pg_fld.c b/modules/db_postgres/pg_fld.c index 46d54f0..de62c14 100644 --- a/modules/db_postgres/pg_fld.c +++ b/modules/db_postgres/pg_fld.c @@ -93,19 +93,23 @@ union ull { uint32_t ui32[2]; }; +#if !defined(__OS_darwin) || (defined(__OS_darwin) && !defined(NTOHLL)) static inline uint64_t htonll(uint64_t in) { union ull* p = (union ull*)&in; return ((uint64_t)htonl(p->ui32[0]) << 32) + (uint64_t)htonl(p->ui32[1]); } +#endif +#if !defined(__OS_darwin) || (defined(__OS_darwin) && !defined(NTOHLL)) static inline uint64_t ntohll(uint64_t in) { union ull* p = (union ull*)&in; return ((uint64_t)ntohl(p->ui32[0]) << 32) + (uint64_t)ntohl(p->ui32[1]); } +#endif static inline void db_int2pg_int4(struct pg_params* dst, int i,

1 0

git:master:35094f0e: .gitignore: ignore emacs desktop file
by Daniel-Constantin Mierla 19 Nov '15

19 Nov '15

Module: kamailio Branch: master Commit: 35094f0ec0bb2bde70b5e3a723ae11a6b97772f0 URL: https://github.com/kamailio/kamailio/commit/35094f0ec0bb2bde70b5e3a723ae11a… Author: Daniel Rus Morales <danirus(a)eml.cc> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-19T13:43:43+01:00 .gitignore: ignore emacs desktop file --- Modified: .gitignore --- Diff: https://github.com/kamailio/kamailio/commit/35094f0ec0bb2bde70b5e3a723ae11a… Patch: https://github.com/kamailio/kamailio/commit/35094f0ec0bb2bde70b5e3a723ae11a… --- diff --git a/.gitignore b/.gitignore index e0ed45f..d377293 100644 --- a/.gitignore +++ b/.gitignore @@ -36,6 +36,8 @@ utils/protoshoot/protoshoot *~ # Emacs file locks .#* +# Emacs desktop files +.emacs.desktop* # MacOSX auto-generated files libiname.lst *.dylib

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
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