From 323862892c54d4f1b2387da9ea138a34c3e3d913 Mon Sep 17 00:00:00 2001 From: David Carlier Date: Mon, 16 Dec 2024 23:37:19 +0000 Subject: [PATCH] ext/posix: php_posix_group_to_array loop exit condition beforehand instead --- ext/posix/posix.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ext/posix/posix.c b/ext/posix/posix.c index fc4928d5d2cf5..6e5149aa90256 100644 --- a/ext/posix/posix.c +++ b/ext/posix/posix.c @@ -673,13 +673,13 @@ int php_posix_group_to_array(struct group *g, zval *array_group) /* {{{ */ add_assoc_null(array_group, "passwd"); } for (count = 0;; count++) { - /* gr_mem entries may be misaligned on macos. */ - char *gr_mem; - memcpy(&gr_mem, &g->gr_mem[count], sizeof(char *)); - if (!gr_mem) { + if (!g->gr_mem[count]) { break; } + char *gr_mem; + /* gr_mem entries may be misaligned on macos. */ + memcpy(&gr_mem, &g->gr_mem[count], sizeof(char *)); add_next_index_string(&array_members, gr_mem); } zend_hash_str_update(Z_ARRVAL_P(array_group), "members", sizeof("members")-1, &array_members);