Module: kamailio Branch: 4.1 Commit: 4dce9a6e9e15a6aaa6cf31a563c4e5684a0ddf7a URL: https://github.com/kamailio/kamailio/commit/4dce9a6e9e15a6aaa6cf31a563c4e56… Author: Stefan Mititelu &lt;stefan.mititelu(a)1and1.ro&gt; Committer: Stefan Mititelu &lt;stefan.mititelu(a)1and1.ro&gt; 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; }