archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.3' into PHP-7.4

Browse source 
* PHP-7.3:
  Fix 78213: Empty row pocket
This commit is contained in:
Christoph M. Becker 2019-07-31 18:08:05 +02:00
commit 1f9a77baef
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
NEWS
View file

@ -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)

2
ext/mysqlnd/mysqlnd_block_alloc.c
View file

@ -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;