fix #40800 (cannot disable memory_limit with -1)

diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index 03914cc62952d2f8be486fda11d1edc17966fc5c..c7add9669782b6ad2cc4beb9e7095d424d13467c 100644 (file)
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -2133,7 +2133,7 @@ ZEND_API zstr zend_zstrndup(int type, const zstr s, uint length)
        }
 }
 
-ZEND_API int zend_set_memory_limit(unsigned int memory_limit)
+ZEND_API int zend_set_memory_limit(size_t memory_limit)
 {
        TSRMLS_FETCH();
 

diff --git a/Zend/zend_alloc.h b/Zend/zend_alloc.h
index b8da3bdc2a35a81deaf17cd0c101093324a8e812..d3db8ca9ace3ab4c277648b7269b32f880f0554a 100644 (file)
--- a/Zend/zend_alloc.h
+++ b/Zend/zend_alloc.h
@@ -117,7 +117,7 @@ ZEND_API size_t _zend_mem_block_size(void *ptr TSRMLS_DC ZEND_FILE_LINE_DC ZEND_
 #define safe_eustrdup(ptr)  ((ptr)?(eustrdup((ptr))):STR_EMPTY_ALLOC())
 #define safe_eustrndup(ptr, len) ((ptr)?(eustrndup((ptr),(len))):STR_EMPTY_ALLOC())
 
-ZEND_API int zend_set_memory_limit(unsigned int memory_limit);
+ZEND_API int zend_set_memory_limit(size_t memory_limit);
 
 ZEND_API void start_memory_manager(TSRMLS_D);
 ZEND_API void shutdown_memory_manager(int silent, int full_shutdown TSRMLS_DC);