summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Popov <nikic@php.net>2016-05-01 13:07:13 +0200
committerNikita Popov <nikic@php.net>2016-05-01 13:07:13 +0200
commit359af7c64bd47cb3723c4c4fa6cb338018a24360 (patch)
treebef0a6865d30f36d00a7714e3bdc0881b4b593ef
parent6a9a0f2090f646bf6ae972a3e854f9a9acaf1012 (diff)
parent8e855534b70e978a6464081ebe71257269eacdb4 (diff)
downloadphp-git-359af7c64bd47cb3723c4c4fa6cb338018a24360.tar.gz
Merge branch 'PHP-7.0'
-rw-r--r--ext/posix/posix.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/posix/posix.c b/ext/posix/posix.c
index 25cb26f372..771e316325 100644
--- a/ext/posix/posix.c
+++ b/ext/posix/posix.c
@@ -987,7 +987,7 @@ 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);
- if (array_group->gr_passwd) {
+ if (g->gr_passwd) {
add_assoc_string(array_group, "passwd", g->gr_passwd);
} else {
add_assoc_null(array_group, "passwd");