From 70369b388817ebcbae396389246c8dad5109a3b9 Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Mon, 5 May 2003 19:57:40 +0000 Subject: [PATCH] MFH --- ext/standard/tests/serialize/001.phpt | 6 +++--- ext/standard/tests/serialize/003.phpt | 4 ++-- main/snprintf.c | 4 ++++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ext/standard/tests/serialize/001.phpt b/ext/standard/tests/serialize/001.phpt index ab8ac99c53..811355beb7 100644 --- a/ext/standard/tests/serialize/001.phpt +++ b/ext/standard/tests/serialize/001.phpt @@ -79,13 +79,13 @@ i:0; i:-1; i:2147483647; i:-2147483647; -d:1.123456789; +d:1.123456789000000011213842299184761941432952880859375; d:1; d:0; d:-1; -d:-1.123456789; +d:-1.123456789000000011213842299184761941432952880859375; s:5:"hallo"; -a:6:{i:0;i:1;i:1;d:1.1;i:2;s:5:"hallo";i:3;N;i:4;b:1;i:5;a:0:{}} +a:6:{i:0;i:1;i:1;d:1.100000000000000088817841970012523233890533447265625;i:2;s:5:"hallo";i:3;N;i:4;b:1;i:5;a:0:{}} O:1:"t":1:{s:1:"a";s:5:"hallo";} object(t)(1) { ["a"]=> diff --git a/ext/standard/tests/serialize/003.phpt b/ext/standard/tests/serialize/003.phpt index 43e9077382..b4fbcc1200 100644 --- a/ext/standard/tests/serialize/003.phpt +++ b/ext/standard/tests/serialize/003.phpt @@ -17,8 +17,8 @@ float(100) d:5.2E+25; float(5.2E+25) -d:8.529E-22; +d:8.528999999999999914734871708787977695465087890625E-22; float(8.529E-22) -d:9E-09; +d:9.0000000000000017763568394002504646778106689453125E-9; float(9.E-9) diff --git a/main/snprintf.c b/main/snprintf.c index 37c7e0849e..9593f5909c 100644 --- a/main/snprintf.c +++ b/main/snprintf.c @@ -367,6 +367,10 @@ ap_php_gcvt(double number, int ndigit, char *buf, boolean_e altform) register int i; char buf1[NDIG]; + if (ndigit >= NDIG - 1) { + ndigit = NDIG - 2; + } + p1 = ap_php_ecvt(number, ndigit, &decpt, &sign, buf1); p2 = buf; if (sign) -- 2.40.0