- Fix crash when chown() 2nd parameter is something else than integer or string

diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c
index 7797705ed721f282420ef935db6f4d4816b3b5e8..34e622a1cbc0f8d767ecc6fcd6026d1f57506bf0 100644 (file)
--- a/ext/standard/filestat.c
+++ b/ext/standard/filestat.c
@@ -434,7 +434,8 @@ static void php_do_chgrp(INTERNAL_FUNCTION_PARAMETERS, int do_lchgrp) /* {{{ */
        if (Z_TYPE_P(group) == IS_LONG) {
                gid = (gid_t)Z_LVAL_P(group);
        } else if (Z_TYPE_P(group) == IS_STRING ||
-                  Z_TYPE_P(group) == IS_UNICODE) {
+                  Z_TYPE_P(group) == IS_UNICODE
+       ) {
                if (Z_TYPE_P(group) == IS_UNICODE) {
                        zval_unicode_to_string(group TSRMLS_CC);
                }
@@ -466,7 +467,7 @@ static void php_do_chgrp(INTERNAL_FUNCTION_PARAMETERS, int do_lchgrp) /* {{{ */
                gid = gr->gr_gid;
 #endif
        } else {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "parameter 2 should be string or integer, %s given",zend_zval_type_name(group));
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "parameter 2 should be string or integer, %s given", zend_zval_type_name(group));
                RETURN_FALSE;
        }
 
@@ -548,8 +549,13 @@ static void php_do_chown(INTERNAL_FUNCTION_PARAMETERS, int do_lchown) /* {{{ */
        }
 
        if (Z_TYPE_P(user) == IS_LONG) {
-               uid = (uid_t)Z_LVAL_P(user);
-       } else {
+               uid = (uid_t) Z_LVAL_P(user);
+       } else if (Z_TYPE_P(user) == IS_STRING ||
+                  Z_TYPE_P(user) == IS_UNICODE
+       ) {
+               if (Z_TYPE_P(user) == IS_UNICODE) {
+                       zval_unicode_to_string(user TSRMLS_CC);
+               }
 #if defined(ZTS) && defined(_SC_GETPW_R_SIZE_MAX) && defined(HAVE_GETPWNAM_R)
                struct passwd pw;
                struct passwd *retpwptr = NULL;
@@ -577,6 +583,9 @@ static void php_do_chown(INTERNAL_FUNCTION_PARAMETERS, int do_lchown) /* {{{ */
                }
                uid = pw->pw_uid;
 #endif
+       } else {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "parameter 2 should be string or integer, %s given", zend_zval_type_name(user));
+               RETURN_FALSE;
        }
 
        if (filename_type == IS_UNICODE) {