diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-07-31 18:08:05 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-07-31 18:08:05 +0200 |
| commit | 1f9a77baefb65dee1a9c01bde90dc27f5b824b29 (patch) | |
| tree | 6364d2332f6bfc5afcc4082495daba1ba27a9303 /ext/mysqlnd/mysqlnd_block_alloc.c | |
| parent | 3e8774e57a4bdc877e52bcefa1e6c4e9f4058486 (diff) | |
| parent | 8af14024c2134da5042fbafa01e70b6e0b338cd7 (diff) | |
| download | php-git-1f9a77baefb65dee1a9c01bde90dc27f5b824b29.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix 78213: Empty row pocket
Diffstat (limited to 'ext/mysqlnd/mysqlnd_block_alloc.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_block_alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |