From 895337ddbdeb322da3c583ef7ea03b45d0c8282c Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Sun, 1 May 2016 11:00:41 +0800 Subject: Fixed bug #72133 (php_posix_group_to_array crashes if gr_passwd is NULL) --- ext/posix/posix.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'ext/posix') diff --git a/ext/posix/posix.c b/ext/posix/posix.c index e1f4ef6262..25cb26f372 100644 --- a/ext/posix/posix.c +++ b/ext/posix/posix.c @@ -987,8 +987,12 @@ int php_posix_group_to_array(struct group *g, zval *array_group) /* {{{ */ array_init(&array_members); add_assoc_string(array_group, "name", g->gr_name); - add_assoc_string(array_group, "passwd", g->gr_passwd); - for (count=0; g->gr_mem[count] != NULL; count++) { + if (array_group->gr_passwd) { + add_assoc_string(array_group, "passwd", g->gr_passwd); + } else { + add_assoc_null(array_group, "passwd"); + } + for (count = 0; g->gr_mem[count] != NULL; count++) { add_next_index_string(&array_members, g->gr_mem[count]); } zend_hash_str_update(Z_ARRVAL_P(array_group), "members", sizeof("members")-1, &array_members); -- cgit v1.2.1