mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-02 07:35:26 +00:00
Code Issues Releases Wiki Activity

Merge branch '474-mempool-is-broken-if-object-size-is-below-the-alignment-size' into 'master'

Browse Source 
Resolve "mempool is broken if object size is below the alignment size"

Closes #474

See merge request isc-projects/bind9!635
This commit is contained in:
Evan Hunt
2018-08-14 04:09:17 -04:00
parent dc5b8ec97a 5dd1beec8e
commit e0d309572f
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/isc/mem.c
View File

@@ -1841,6 +1841,12 @@ isc__mempool_create(isc_mem_t *mctx0, size_t size, isc_mempool_t **mpctxp) {
mpctx->common.magic = ISCAPI_MPOOL_MAGIC; mpctx->common.magic = ISCAPI_MPOOL_MAGIC;
mpctx->lock = NULL; mpctx->lock = NULL;
mpctx->mctx = mctx; mpctx->mctx = mctx;
/*
* Mempools are stored as a linked list of element.
*/
if (size < sizeof(element)) {
size = sizeof(element);
}
mpctx->size = size; mpctx->size = size;
mpctx->maxalloc = UINT_MAX; mpctx->maxalloc = UINT_MAX;
mpctx->allocated = 0; mpctx->allocated = 0;

15
lib/isc/tests/mem_test.c
View File

@@ -137,6 +137,21 @@ ATF_TC_BODY(isc_mem, tc) {
isc_mem_destroy(&localmctx); isc_mem_destroy(&localmctx);
result = isc_mem_createx2(0, 0, default_memalloc, default_memfree,
NULL, &localmctx,
ISC_MEMFLAG_FILL | ISC_MEMFLAG_INTERNAL);
ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
result = isc_mempool_create(localmctx, 2, &mp1);
ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
tmp = isc_mempool_get(mp1);
ATF_CHECK(tmp != NULL);
isc_mempool_put(mp1, tmp);
isc_mempool_destroy(&mp1);
isc_test_end(); isc_test_end();
} }