Merge branch 'master' of https://git.php.net/push/php-src

Author: KalleZ

ext/intl/collator/collator.h

@@ -16,7 +16,7 @@
  */
 
 #ifndef COLLATOR_COLLATOR_H
-#define CCOLLATOR_COLLATOR_H
+#define COLLATOR_COLLATOR_H
 
 #include <php.h>
 

ext/intl/timezone/timezone_methods.cpp

@@ -240,18 +240,12 @@ U_CFUNC PHP_FUNCTION(intltz_create_time_zone_id_enumeration)
 	size_t		region_len	= 0;
 	int32_t	offset,
 			*offsetp	= NULL;
-	int		arg3isnull	= 0;
-	intl_error_reset(NULL);
+	zend_bool arg3isnull = 1;
 
-	/* must come before zpp because zpp would convert the arg in the stack to 0 */
-	if (ZEND_NUM_ARGS() == 3) {
-		zval *dummy, *zvoffset;
-		arg3isnull = zend_get_parameters_ex(3, &dummy, &dummy, &zvoffset)
-				!= FAILURE && Z_TYPE_P(zvoffset) == IS_NULL;
-	}
+	intl_error_reset(NULL);
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "l|s!l",
-			&zoneType, &region, &region_len, &offset_arg) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "l|s!l!",
+			&zoneType, &region, &region_len, &offset_arg, &arg3isnull) == FAILURE) {
 		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
 			"intltz_create_time_zone_id_enumeration: bad arguments", 0);
 		RETURN_FALSE;
@@ -264,18 +258,15 @@ U_CFUNC PHP_FUNCTION(intltz_create_time_zone_id_enumeration)
 		RETURN_FALSE;
 	}
 
-	if (ZEND_NUM_ARGS() == 3) {
+	if (!arg3isnull) {
 		if (offset_arg < (zend_long)INT32_MIN || offset_arg > (zend_long)INT32_MAX) {
 			intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
 				"intltz_create_time_zone_id_enumeration: offset out of bounds", 0);
 			RETURN_FALSE;
 		}
-		
-		if (!arg3isnull) {
-			offset = (int32_t)offset_arg;
-			offsetp = &offset;
-		} //else leave offsetp NULL
-	}
+		offset = (int32_t)offset_arg;
+		offsetp = &offset;
+	} //else leave offsetp NULL
 
 	StringEnumeration *se;
 	UErrorCode uec = UErrorCode();

ext/standard/string.c

@@ -5385,6 +5385,7 @@ PHP_FUNCTION(money_format)
 	double value;
 	zend_bool check = 0;
 	zend_string *str;
+	ssize_t res_len;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "sd", &format, &format_len, &value) == FAILURE) {
 		return;
@@ -5405,10 +5406,11 @@ PHP_FUNCTION(money_format)
 	}
 
 	str = zend_string_alloc(format_len + 1024, 0);
-	if ((str->len = strfmon(str->val, str->len, format, value)) < 0) {
+	if ((res_len = strfmon(str->val, str->len, format, value)) < 0) {
 		zend_string_free(str);
 		RETURN_FALSE;
 	}
+	str->len = (size_t)res_len;
 	str->val[str->len] = '\0';
 
 	RETURN_NEW_STR(zend_string_realloc(str, str->len, 0));