diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2018-09-17 20:52:12 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-09-17 20:59:16 +0200 |
| commit | 37dc710ae63a2cb946b24ebb8ec1bccb0390424f (patch) | |
| tree | 7eb384c39f036357db8f2ac9e52057f9056eb561 | |
| parent | 02664aee5c934222ad3dcbcb24de524f5db14588 (diff) | |
| download | php-git-37dc710ae63a2cb946b24ebb8ec1bccb0390424f.tar.gz | |
Remove my_estrdup() and my_efree() macros
Replace the single use of my_efree().
| -rw-r--r-- | ext/mysqli/mysqli.c | 4 | ||||
| -rw-r--r-- | ext/mysqli/php_mysqli_structs.h | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c index a25bc096ce..f74df1facb 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -200,7 +200,9 @@ static void mysqli_objects_free_storage(zend_object *object) mysqli_object *intern = php_mysqli_fetch_object(object); MYSQLI_RESOURCE *my_res = (MYSQLI_RESOURCE *)intern->ptr; - my_efree(my_res); + if (my_res) { + efree(my_res); + } zend_object_std_dtor(&intern->zo); } /* }}} */ diff --git a/ext/mysqli/php_mysqli_structs.h b/ext/mysqli/php_mysqli_structs.h index 1b7ffddb1a..964bb56db3 100644 --- a/ext/mysqli/php_mysqli_structs.h +++ b/ext/mysqli/php_mysqli_structs.h @@ -342,9 +342,6 @@ ZEND_END_MODULE_GLOBALS(mysqli) ZEND_TSRMLS_CACHE_EXTERN() #endif -#define my_estrdup(x) (x) ? estrdup(x) : NULL -#define my_efree(x) if (x) efree(x) - ZEND_EXTERN_MODULE_GLOBALS(mysqli) #endif /* PHP_MYSQLI_STRUCTS.H */ |