Fix 78213: Empty row pocket

We have to ensure that we don't create an arena which is smaller than
its header, regardless of the configured alignment.
This commit is contained in:
Christoph M. Becker 2019-07-31 18:05:40 +02:00
parent ef439abd46
commit 8af14024c2
2 changed files with 4 additions and 1 deletions

View file

@ -161,7 +161,7 @@ mysqlnd_mempool_create(size_t arena_size)
MYSQLND_MEMORY_POOL * ret;
DBG_ENTER("mysqlnd_mempool_create");
arena = mysqlnd_arena_create(MAX(arena_size, sizeof(zend_arena)));
arena = mysqlnd_arena_create(MAX(arena_size, ZEND_MM_ALIGNED_SIZE(sizeof(zend_arena))));
ret = mysqlnd_arena_alloc(&arena, sizeof(MYSQLND_MEMORY_POOL));
ret->arena = arena;
ret->last = NULL;