[packages/php.git] / php-5.2.17-bug-48484.patch

diff -up php-5.2.17/ext/standard/array.c.bug-48484 php-5.2.17/ext/standard/array.c
--- php-5.2.17/ext/standard/array.c.bug-48484	2010-11-20 04:06:44.000000000 +0600
+++ php-5.2.17/ext/standard/array.c	2011-08-28 00:21:52.000000000 +0700
@@ -4368,11 +4368,11 @@ PHP_FUNCTION(array_product)
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "The argument should be an array");
 		return;
 	}
-	
+
+	ZVAL_LONG(return_value, 1);
 	if (!zend_hash_num_elements(Z_ARRVAL_PP(input))) {
-		RETURN_LONG(0);
+		return;
 	}
-	ZVAL_LONG(return_value, 1);
 
 	for (zend_hash_internal_pointer_reset_ex(Z_ARRVAL_PP(input), &pos);
 		 zend_hash_get_current_data_ex(Z_ARRVAL_PP(input), (void **)&entry, &pos) == SUCCESS;
Commit	Line	Data
fb98beff ER	1	diff -up php-5.2.17/ext/standard/array.c.bug-48484 php-5.2.17/ext/standard/array.c
	2	--- php-5.2.17/ext/standard/array.c.bug-48484 2010-11-20 04:06:44.000000000 +0600
	3	+++ php-5.2.17/ext/standard/array.c 2011-08-28 00:21:52.000000000 +0700
	4	@@ -4368,11 +4368,11 @@ PHP_FUNCTION(array_product)
	5	php_error_docref(NULL TSRMLS_CC, E_WARNING, "The argument should be an array");
	6	return;
	7	}
	8	-
	9	+
	10	+ ZVAL_LONG(return_value, 1);
	11	if (!zend_hash_num_elements(Z_ARRVAL_PP(input))) {
	12	- RETURN_LONG(0);
	13	+ return;
	14	}
	15	- ZVAL_LONG(return_value, 1);
	16
	17	for (zend_hash_internal_pointer_reset_ex(Z_ARRVAL_PP(input), &pos);
	18	zend_hash_get_current_data_ex(Z_ARRVAL_PP(input), (void **)&entry, &pos) == SUCCESS;