summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS3
-rw-r--r--ext/mysqlnd/mysqlnd_block_alloc.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 57c80a88f7..7d1914c470 100644
--- a/NEWS
+++ b/NEWS
@@ -19,6 +19,9 @@ PHP NEWS
. Fixed bug #78342 (Bus error in configure test for iconv //IGNORE). (Rainer
Jung)
+- MySQLnd:
+ . Fixed bug #78213 (Empty row pocket). (cmb)
+
- Opcache:
. Fixed bug #78341 (Failure to detect smart branch in DFA pass). (Nikita)
diff --git a/ext/mysqlnd/mysqlnd_block_alloc.c b/ext/mysqlnd/mysqlnd_block_alloc.c
index 63a48f4faa..7ee952d1c8 100644
--- a/ext/mysqlnd/mysqlnd_block_alloc.c
+++ b/ext/mysqlnd/mysqlnd_block_alloc.c
@@ -95,7 +95,7 @@ mysqlnd_mempool_create(size_t arena_size)
MYSQLND_MEMORY_POOL * ret;
DBG_ENTER("mysqlnd_mempool_create");
- arena = zend_arena_create(MAX(arena_size, sizeof(zend_arena)));
+ arena = zend_arena_create(MAX(arena_size, ZEND_MM_ALIGNED_SIZE(sizeof(zend_arena))));
ret = zend_arena_alloc(&arena, sizeof(MYSQLND_MEMORY_POOL));
ret->arena = arena;
ret->last = NULL;