Module: kamailio Branch: master Commit: 1e6b51a1fb6c3ee2f2fc6c0ea2b8f7ac6270d958 URL: https://github.com/kamailio/kamailio/commit/1e6b51a1fb6c3ee2f2fc6c0ea2b8f7ac...

Author: Daniel-Constantin Mierla miconda@gmail.com Committer: Daniel-Constantin Mierla miconda@gmail.com Date: 2023-11-24T12:53:13+01:00

core/mem: qm - use mem_add_size value

---

Modified: src/core/mem/q_malloc.c

---

Diff: https://github.com/kamailio/kamailio/commit/1e6b51a1fb6c3ee2f2fc6c0ea2b8f7ac... Patch: https://github.com/kamailio/kamailio/commit/1e6b51a1fb6c3ee2f2fc6c0ea2b8f7ac...

---

diff --git a/src/core/mem/q_malloc.c b/src/core/mem/q_malloc.c index c3174873e1a..aa68debdf30 100644 --- a/src/core/mem/q_malloc.c +++ b/src/core/mem/q_malloc.c @@ -405,6 +405,8 @@ void *qm_malloc(void *qmp, size_t size) /*malloc(0) should return a valid pointer according to specs*/ if(unlikely(size == 0)) size = 4; + /*add the value of core parameter that can be set for extra safety*/ + size += ksr_mem_add_size; /*size must be a multiple of 8*/ size = ROUNDUP(size); if(size > (qm->size - qm->real_used)) @@ -682,8 +684,9 @@ void *qm_realloc(void *qmp, void *p, size_t size) abort(); } #endif - /* find first acceptable size */ - size = ROUNDUP(size); + /* find first acceptable size + * - consider the value of core parameter that can be set for extra safety */ + size = ROUNDUP(size + ksr_mem_add_size); if(f->size > size) { orig_size = f->size; /* shrink */ @@ -733,7 +736,9 @@ void *qm_realloc(void *qmp, void *p, size_t size) qm->real_used += (f->size - orig_size); qm->used += (f->size - orig_size); } else { - /* could not join => realloc */ + /* could not join => realloc + * - qm_malloc adds ksr_mem_add_size */ + size = ROUNDUP(size - ksr_mem_add_size); #ifdef DBG_QM_MALLOC ptr = qm_malloc(qm, size, file, func, line, mname); #else