From f0fb9e34a5a2e0919d3264db5c3d69e3e2d2cd63 Mon Sep 17 00:00:00 2001 From: Gina Peter Banyard Date: Mon, 10 Jun 2024 00:08:16 +0100 Subject: [PATCH] ext/spl: use ecalloc instead of complicate memset to 0 --- ext/spl/spl_directory.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c index 1978095db63..2785949095b 100644 --- a/ext/spl/spl_directory.c +++ b/ext/spl/spl_directory.c @@ -186,10 +186,7 @@ static zend_object *spl_filesystem_object_new(zend_class_entry *class_type) { spl_filesystem_object *intern; - intern = emalloc(sizeof(spl_filesystem_object) + zend_object_properties_size(class_type)); - memset(intern, 0, - MAX(XtOffsetOf(spl_filesystem_object, u.dir.entry), - XtOffsetOf(spl_filesystem_object, u.file.escape) + sizeof(int))); + intern = ecalloc(1, sizeof(spl_filesystem_object) + zend_object_properties_size(class_type)); /* intern->type = SPL_FS_INFO; done by set 0 */ intern->file_class = spl_ce_SplFileObject; intern->info_class = spl_ce_SplFileInfo;