From: Ilia Alshanetsky <iliaa@php.net>
Date: Sun, 18 Jul 2004 17:27:49 +0000 (+0000)
Subject: Fixed bug #28633 (sprintf incorrectly adding padding to floats).
X-Git-Tag: PRE_ZEND_VM_DISPATCH_PATCH~465
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8840191d911fc13a940b2dd1d0142fa06b907830;p=php

Fixed bug #28633 (sprintf incorrectly adding padding to floats).
---

diff --git a/ext/standard/formatted_print.c b/ext/standard/formatted_print.c
index f86694e72b..1e71a937d5 100644
--- a/ext/standard/formatted_print.c
+++ b/ext/standard/formatted_print.c
@@ -398,9 +398,6 @@ php_sprintf_appenddouble(char **buffer, int *pos,
 
 	numbuf[i] = '\0';
 
-	if (precision > 0) {
-		width += (precision + 1);
-	}
 	php_sprintf_appendstring(buffer, pos, size, numbuf, width, 0, padding,
 							 alignment, i, sign, 0, always_sign);
 }
diff --git a/ext/standard/tests/strings/bug22207.phpt b/ext/standard/tests/strings/bug22207.phpt
index 1623fb8e41..688bb5b744 100644
--- a/ext/standard/tests/strings/bug22207.phpt
+++ b/ext/standard/tests/strings/bug22207.phpt
@@ -7,5 +7,5 @@ Bug #22207 (missing 0 when using the e notation in *printf functions)
 ?>
 --EXPECT--
 1.1000e+0
-string(17) "       1.1000e+0
+string(11) " 1.1000e+0
 "
diff --git a/ext/standard/tests/strings/bug28633.phpt b/ext/standard/tests/strings/bug28633.phpt
new file mode 100644
index 0000000000..5a1c2567fa
--- /dev/null
+++ b/ext/standard/tests/strings/bug28633.phpt
@@ -0,0 +1,10 @@
+--TEST--
+Bug #28633 (sprintf incorrectly adding padding to floats)
+--FILE--
+<?php
+	echo sprintf("%05.2f", 0.02) . "\n";
+	echo sprintf("%05.2f", 2.02) . "\n";
+?>
+--EXPECT--
+00.02
+02.02