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-8.0'

Browse source 
* PHP-8.0:
  Fixed bug #81070
This commit is contained in:
Nikita Popov 2021-05-31 15:24:29 +02:00
commit b4559e7ae4
4 changed files with 32 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Zend/zend_alloc.c
View file

@ -2658,11 +2658,24 @@ ZEND_API char* ZEND_FASTCALL zend_strndup(const char *s, size_t length)
return p;
}
ZEND_API zend_result zend_set_memory_limit_ex(size_t memory_limit)
{
#if ZEND_MM_LIMIT
if (memory_limit < ZEND_MM_CHUNK_SIZE) {
memory_limit = ZEND_MM_CHUNK_SIZE;
}
if (UNEXPECTED(memory_limit < AG(mm_heap)->real_size)) {
return FAILURE;
}
AG(mm_heap)->limit = memory_limit;
#endif
return SUCCESS;
}
ZEND_API void zend_set_memory_limit(size_t memory_limit)
{
#if ZEND_MM_LIMIT
AG(mm_heap)->limit = (memory_limit >= ZEND_MM_CHUNK_SIZE) ? memory_limit : ZEND_MM_CHUNK_SIZE;
AG(mm_heap)->limit = memory_limit >= ZEND_MM_CHUNK_SIZE ? memory_limit : ZEND_MM_CHUNK_SIZE;
#endif
}