From: Ilia Alshanetsky <iliaa@php.net>
Date: Sat, 26 Oct 2002 22:18:40 +0000 (+0000)
Subject: Better fix for bug #20108.
X-Git-Tag: php-4.3.0pre2~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d88775c5ae38be7d85a062afc3db25b6a20b8617;p=php

Better fix for bug #20108.
---

diff --git a/ext/standard/formatted_print.c b/ext/standard/formatted_print.c
index fc064aac69..81dc808948 100644
--- a/ext/standard/formatted_print.c
+++ b/ext/standard/formatted_print.c
@@ -159,6 +159,10 @@ php_sprintf_appendstring(char **buffer, int *pos, int *size, char *add,
 {
 	register int npad;
 
+	if (max_width && min_width) {
+		expprec = max_width = 0;	
+	}
+
 	npad = min_width - MIN(len, (expprec ? max_width : len));
 
 	if (npad < 0) {
@@ -605,10 +609,10 @@ php_formatted_print(int ht, int *len, int use_array TSRMLS_DC)
 					convert_to_string_ex(args[argnum]);
 					php_sprintf_appendstring(&result, &outpos, &size,
 											 Z_STRVAL_PP(args[argnum]),
-											 width, 0, padding,
+											 width, precision, padding,
 											 alignment,
 											 Z_STRLEN_PP(args[argnum]),
-											 0, 0);
+											 0, expprec);
 					break;
 
 				case 'd':