]> granicus.if.org Git - php/commitdiff
Fix group macro access.
authorAndrei Zmievski <andrei@php.net>
Fri, 1 Dec 2006 18:42:24 +0000 (18:42 +0000)
committerAndrei Zmievski <andrei@php.net>
Fri, 1 Dec 2006 18:42:24 +0000 (18:42 +0000)
ext/standard/filestat.c

index c56823b750f4a3fa6de23dc6fe0838595a011fde..bd077aa51fea037497b4cdd69ee881bbd8d9386f 100644 (file)
@@ -424,8 +424,8 @@ static void php_do_chgrp(INTERNAL_FUNCTION_PARAMETERS, int do_lchgrp)
                char *grbuf = emalloc(grbuflen);
 
                convert_to_string(group);
-               if (getgrnam_r(Z_STRVAL_PP(group), &gr, grbuf, grbuflen, &retgrptr) != 0 || retgrptr == NULL) {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find gid for %s", Z_STRVAL_PP(group));
+               if (getgrnam_r(Z_STRVAL_P(group), &gr, grbuf, grbuflen, &retgrptr) != 0 || retgrptr == NULL) {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find gid for %s", Z_STRVAL_P(group));
                        efree(grbuf);
                        RETURN_FALSE;
                }
@@ -528,8 +528,8 @@ static void php_do_chown(INTERNAL_FUNCTION_PARAMETERS, int do_lchown)
                char *pwbuf = emalloc(pwbuflen);
 
                convert_to_string(user);
-               if (getpwnam_r(Z_STRVAL_PP(user), &pw, pwbuf, pwbuflen, &retpwptr) != 0 || retpwptr == NULL) {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find uid for %s", Z_STRVAL_PP(user));
+               if (getpwnam_r(Z_STRVAL_P(user), &pw, pwbuf, pwbuflen, &retpwptr) != 0 || retpwptr == NULL) {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find uid for %s", Z_STRVAL_P(user));
                        efree(pwbuf);
                        RETURN_FALSE;
                }