Skip to content

Commit 37dc710

Browse files
committed
Remove my_estrdup() and my_efree() macros
Replace the single use of my_efree().
1 parent 02664ae commit 37dc710

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

ext/mysqli/mysqli.c

+3-1
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,9 @@ static void mysqli_objects_free_storage(zend_object *object)
200200
mysqli_object *intern = php_mysqli_fetch_object(object);
201201
MYSQLI_RESOURCE *my_res = (MYSQLI_RESOURCE *)intern->ptr;
202202

203-
my_efree(my_res);
203+
if (my_res) {
204+
efree(my_res);
205+
}
204206
zend_object_std_dtor(&intern->zo);
205207
}
206208
/* }}} */

ext/mysqli/php_mysqli_structs.h

-3
Original file line numberDiff line numberDiff line change
@@ -342,9 +342,6 @@ ZEND_END_MODULE_GLOBALS(mysqli)
342342
ZEND_TSRMLS_CACHE_EXTERN()
343343
#endif
344344

345-
#define my_estrdup(x) (x) ? estrdup(x) : NULL
346-
#define my_efree(x) if (x) efree(x)
347-
348345
ZEND_EXTERN_MODULE_GLOBALS(mysqli)
349346

350347
#endif /* PHP_MYSQLI_STRUCTS.H */

0 commit comments

Comments
 (0)