- type is either 1 or 2 if second parameter is set. if not set then type

is 0. - use the lvalue for the second rvalue
22 years ago · 1236cfa38a
1 changed files with 2 additions and 3 deletions
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@ -4678,10 +4678,9 @@ PHP_FUNCTION(str_word_count)

 	convert_to_string_ex(str);
 	
-	p = s = Z_STRVAL_PP(str);
-	e = Z_STRVAL_PP(str) + Z_STRLEN_PP(str);
+	e = Z_STRLEN_PP(str) + (p = s = Z_STRVAL_PP(str));
 		
-	if (type == 1 || type == 2) {
+	if (type) {
 		array_init(return_value);
 	}