diff options
| author | Xinchen Hui <laruence@gmail.com> | 2018-07-23 15:49:04 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2018-07-23 15:49:04 +0800 |
| commit | 850c67e957cf9df61769fdadd2337e3332bee186 (patch) | |
| tree | eae837e7ed286378807f1ea0ab7b685d55195c66 | |
| parent | c93aba042f8923de9d0078a769f14d8c13016476 (diff) | |
| parent | c20a97df6d48c60f6221a502fae934306666d41c (diff) | |
| download | php-git-850c67e957cf9df61769fdadd2337e3332bee186.tar.gz | |
Merge branch 'PHP-7.2'
* PHP-7.2:
Fixed pefree_size (efree_size will be expaned to do {} while () form)
| -rw-r--r-- | Zend/zend_alloc.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Zend/zend_alloc.h b/Zend/zend_alloc.h index e870e8b423..e3ab221e1f 100644 --- a/Zend/zend_alloc.h +++ b/Zend/zend_alloc.h @@ -195,7 +195,14 @@ ZEND_API void * __zend_realloc(void *p, size_t len) ZEND_ATTRIBUTE_ALLOC_SIZE(2) #define pemalloc(size, persistent) ((persistent)?__zend_malloc(size):emalloc(size)) #define safe_pemalloc(nmemb, size, offset, persistent) ((persistent)?_safe_malloc(nmemb, size, offset):safe_emalloc(nmemb, size, offset)) #define pefree(ptr, persistent) ((persistent)?free(ptr):efree(ptr)) -#define pefree_size(ptr, size, persistent) ((persistent)?free(ptr):efree_size(ptr, size)) +#define pefree_size(ptr, size, persistent) do { \ + if (persistent) { \ + free(ptr); \ + } else { \ + efree_size(ptr, size);\ + } \ + } while (0) + #define pecalloc(nmemb, size, persistent) ((persistent)?__zend_calloc((nmemb), (size)):ecalloc((nmemb), (size))) #define perealloc(ptr, size, persistent) ((persistent)?__zend_realloc((ptr), (size)):erealloc((ptr), (size))) #define perealloc2(ptr, size, copy_size, persistent) ((persistent)?__zend_realloc((ptr), (size)):erealloc2((ptr), (size), (copy_size))) |