From: Jani Taskinen <jani@php.net>
Date: Wed, 21 Nov 2007 11:30:29 +0000 (+0000)
Subject: MFH: fix crash bug in chown when 2nd parameter != string or int
X-Git-Tag: RELEASE_1_3_1~597
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e42bc45c21af4f9614fed629d6828ea45962e76d;p=php

MFH: fix crash bug in chown when 2nd parameter != string or int
---

diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c
index 81663a15d1..e38216c37c 100644
--- a/ext/standard/filestat.c
+++ b/ext/standard/filestat.c
@@ -430,7 +430,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;
 	}
 
@@ -502,7 +502,7 @@ 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 {
+	} else if (Z_TYPE_P(user) == IS_STRING) {
 #if defined(ZTS) && defined(_SC_GETPW_R_SIZE_MAX) && defined(HAVE_GETPWNAM_R)
 		struct passwd pw;
 		struct passwd *retpwptr = NULL;
@@ -530,9 +530,12 @@ 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 (PG(safe_mode) &&(!php_checkuid(filename, NULL, CHECKUID_ALLOW_FILE_NOT_EXISTS))) {
+	if (PG(safe_mode) && (!php_checkuid(filename, NULL, CHECKUID_ALLOW_FILE_NOT_EXISTS))) {
 		RETURN_FALSE;
 	}