ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

expand the pool then copy over the old entries so we that failures do not break the old pool; also don't leak the new pool on error

Browse Source
This commit is contained in:
Mark Andrews
2018-10-19 19:36:17 +11:00
parent 3171f0dab9
commit afde30fe9b
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/isc/pool.c
View File

@@ -131,21 +131,22 @@ isc_pool_expand(isc_pool_t **sourcep, unsigned int count,
newpool->init = pool->init;
newpool->initarg = pool->initarg;
/* Populate the new entries */
for (i = pool->count; i < count; i++) {
result = newpool->init(&newpool->pool[i],
newpool->initarg);
if (result != ISC_R_SUCCESS) {
isc_pool_destroy(&newpool);
return (result);
}
}
/* Copy over the objects from the old pool */
for (i = 0; i < pool->count; i++) {
newpool->pool[i] = pool->pool[i];
pool->pool[i] = NULL;
}
/* Populate the new entries */
for (i = pool->count; i < count; i++) {
result = pool->init(&newpool->pool[i], pool->initarg);
if (result != ISC_R_SUCCESS) {
isc_pool_destroy(&pool);
return (result);
}
}
isc_pool_destroy(&pool);
pool = newpool;
}