Skip to content

Commit 8af1402

Browse files
committed
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.
1 parent ef439ab commit 8af1402

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ PHP NEWS
2121
- LiteSpeed:
2222
. Updated to LiteSpeed SAPI V7.5 (Fixed clean shutdown). (George Wang)
2323

24+
- MySQLnd:
25+
. Fixed bug #78213 (Empty row pocket). (cmb)
26+
2427
- Standard:
2528
. Fixed bug #69100 (Bus error from stream_copy_to_stream (file -> SSL stream)
2629
with invalid length). (Nikita)

ext/mysqlnd/mysqlnd_block_alloc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ mysqlnd_mempool_create(size_t arena_size)
161161
MYSQLND_MEMORY_POOL * ret;
162162

163163
DBG_ENTER("mysqlnd_mempool_create");
164-
arena = mysqlnd_arena_create(MAX(arena_size, sizeof(zend_arena)));
164+
arena = mysqlnd_arena_create(MAX(arena_size, ZEND_MM_ALIGNED_SIZE(sizeof(zend_arena))));
165165
ret = mysqlnd_arena_alloc(&arena, sizeof(MYSQLND_MEMORY_POOL));
166166
ret->arena = arena;
167167
ret->last = NULL;

0 commit comments

Comments
 (0)