fixup

Author: marc-mabe

ext/standard/math.c

@@ -1134,19 +1134,25 @@ PHPAPI zend_string *_php_math_number_format_ex(double d, int dec, const char *de
 PHPAPI zend_string *_php_math_number_format_long(zend_long num, int dec, const char *dec_point,
 		size_t dec_point_len, const char *thousand_sep, size_t thousand_sep_len)
 {
-	int neg = num < 0;
-	zend_ulong num_abs = neg ? ((zend_ulong)-(num + 1)) + 1 : (zend_ulong)num;
+	int is_negative = 0;
+	zend_ulong num_abs;
 	zend_string *res;
-	zend_string *res2;
 	zend_string *tmpbuf;
-	char *s, *t, *t2;  /* source, target */
+	char *s, *t;  /* source, target */
 	size_t integral;
 	size_t reslen = 0;
 	int count = 0;
 	size_t topad;
 	char cur_char;
 	int roundup = 0;
 
+	if (num < 0) {
+		is_negative = 1;
+		num_abs = ((zend_ulong)-(num + 1)) + 1;
+	} else {
+		num_abs = (zend_ulong)num;
+	}
+
 	tmpbuf = strpprintf(0, ZEND_ULONG_FMT, num_abs);
 
 	/* rounding more places than length of num
@@ -1173,7 +1179,7 @@ PHPAPI zend_string *_php_math_number_format_long(zend_long num, int dec, const c
 		integral = zend_safe_addmult((integral-1)/3, thousand_sep_len, integral, "number formatting");
 	}
 
-	reslen = integral + neg;
+	reslen = integral + is_negative;
 
 	if (dec > 0) {
 		reslen += dec;
@@ -1185,7 +1191,6 @@ PHPAPI zend_string *_php_math_number_format_long(zend_long num, int dec, const c
 
 	res = zend_string_alloc(reslen, 0);
 
-	s = ZSTR_VAL(tmpbuf) + ZSTR_LEN(tmpbuf) - 1;
 	t = ZSTR_VAL(res) + reslen;
 	*t-- = '\0';
 
@@ -1208,8 +1213,8 @@ PHPAPI zend_string *_php_math_number_format_long(zend_long num, int dec, const c
 	/* copy the numbers before the decimal point,
 	 * adding thousand separator every three digits,
 	 * round negative decimal places if needed */
+	s = ZSTR_VAL(tmpbuf) + ZSTR_LEN(tmpbuf) - 1;
 	topad = 0;
-	cur_char = *s;
 	while (s >= ZSTR_VAL(tmpbuf)) {
 		cur_char = *s--;
 		if (roundup && cur_char != '-') {
@@ -1238,36 +1243,38 @@ PHPAPI zend_string *_php_math_number_format_long(zend_long num, int dec, const c
 		}
 	}
 
-	if (neg) {
+	if (is_negative) {
 		*t-- = '-';
 	}
 
 	/* Allocate more bytes in case we have to round up to more places than initially thought
-	 * E.g. 999 with negative decimals between -1 and -3 needs to end up as 1.000 */
+	 * E.g. 999 with negative decimals between -1 and -3 ends up as 1.000 */
 	if (roundup) {
+		/* roundup to next number and eventually add another thousand separator */
 		reslen += 1 + (thousand_sep && (count%3)==0 ? thousand_sep_len : 0);
-		res2 = zend_string_alloc(reslen, 0);
 
-		t2 = ZSTR_VAL(res2);
-		if (neg) {
-			*t2++ = '-';
-			*t2++ = '1';
+		/* previous result is the new temporary buffer */
+		zend_string_release_ex(tmpbuf, 0);
+		tmpbuf = res;
+		res = zend_string_alloc(reslen, 0);
+
+		t = ZSTR_VAL(res);
+		if (is_negative) {
+			*t++ = '-';
+			*t++ = '1';
 			if (thousand_sep && (count%3) == 0) {
-				memcpy(t2, thousand_sep, thousand_sep_len);
-				t2 += thousand_sep_len;
+				memcpy(t, thousand_sep, thousand_sep_len);
+				t += thousand_sep_len;
 			}
-			memcpy(t2, ZSTR_VAL(res)+1, reslen - 2);
+			memcpy(t, ZSTR_VAL(tmpbuf)+1, reslen - 1);
 		} else {
-			*t2++ = '1';
+			*t++ = '1';
 			if (thousand_sep && (count%3) == 0) {
-				memcpy(t2, thousand_sep, thousand_sep_len);
-				t2 += thousand_sep_len;
+				memcpy(t, thousand_sep, thousand_sep_len);
+				t += thousand_sep_len;
 			}
-			memcpy(t2, ZSTR_VAL(res), reslen - 1);
+			memcpy(t, ZSTR_VAL(tmpbuf), reslen);
 		}
-
-		zend_string_release_ex(res, 0);
-		res = res2;
 	}
 
 	ZSTR_LEN(res) = reslen;