Fix an error in [b22cdd67] that can cause a negative infinity to be (rarely)

reported as a positive infinity.

FossilOrigin-Name: 9780b23ca375de6a542516fbc03eb39d5a393ca577718fda231d0d0ccf3b1c7e

diff --git a/manifest b/manifest
index 02e9cbfbb7ca46a43f04009086f3d97f6691ec7e..6c4f40480287232f0ef4471cb1be21b75e25b75e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Changes\sto\s(hopefully)\sget\sthe\sbuild\sworking\swith\srecent\sIntel\scompilers.
-D 2017-09-12T13:27:43.222
+C Fix\san\serror\sin\s[b22cdd67]\sthat\scan\scause\sa\snegative\sinfinity\sto\sbe\s(rarely)\nreported\sas\sa\spositive\sinfinity.
+D 2017-09-12T15:05:34.004
 F Makefile.in c644bbe8ebe4aae82ad6783eae6b6beea4c727b99ff97568b847ced5e2ac7afb
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 6a7a74bf60ad395098c0bd175ab054cd65ef85d7f034198d52bcc4d9e5fb4c6b
@@ -523,7 +523,7 @@ F src/treeview.c 2ee4a5dada213d5ab08a742af5c876cee6f1aaae65f10a61923f3fb63846afe
 F src/trigger.c 48e0f7ed6749ce4d50a695e09e20ce9cf84ecabf2691852c965a51e0b620eccc
 F src/update.c 5404be9e840717323a69209190cdbc9d0d34adaedaaf1d1a1069babf2c4171c0
 F src/utf.c 810fbfebe12359f10bc2a011520a6e10879ab2a163bcb26c74768eab82ea62a5
-F src/util.c c2e1f79f6aa027d67eeae82390c633597fa936679a0e63d03eaf8a6789f65783
+F src/util.c ece10cb34b4a62cbb3aab8d711b67e93a2765e0b81d0f72458cb801a3ac60703
 F src/vacuum.c 90839322fd5f00df9617eb21b68beda9b6e2a2937576b0d65985e4aeb1c53739
 F src/vdbe.c 82fc4553a0986a06bdd0d2b03a424e159bba5c74802fabb2841aa6cd27ccd962
 F src/vdbe.h d50cadf12bcf9fb99117ef392ce1ea283aa429270481426b6e8b0280c101fd97
@@ -1057,7 +1057,7 @@ F test/multiplex3.test d228f59eac91839a977eac19f21d053f03e4d101
 F test/multiplex4.test e8ae4c4bd70606a5727743241f13b5701990abe4
 F test/mutex1.test ea2cc74d97f077b9e74c84cbd024f14d79a8126f
 F test/mutex2.test bfeaeac2e73095b2ac32285d2756e3a65e681660
-F test/nan.test dacc57f80859c06a433d30839336fe227d2038b3
+F test/nan.test 437d40e6d0778b050d7750726c0cbd2c9936b81962926e8f8c48ca698f00f4d1
 F test/nockpt.test 9a436a7213ba5ef7a32304998d386d3ea3f76c9d
 F test/nolock.test f196cf8b8fbea4e2ca345140a2b3f3b0da45c76e
 F test/notify1.test 669b2b743618efdc18ca4b02f45423d5d2304abf
@@ -1653,7 +1653,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P d7b7f038a2c5e81a58c1dd4b556096b58ce10c30eb74fd4b770445927fdb62f3
-R faaafb9d700186855b0c5f4648cf9c3d
+P b22cdd6734ecda2b2b9749668f353abc2660f192d6a40c5d266309d30e25695e
+R 39b328d722a14e00d87cd1b0274ba2b6
 U drh
-Z b126c5cc9d8f4cb4e874c4cda7b85db8
+Z 7a920600be1c7fd6aaa5dec418f9fad6

diff --git a/manifest.uuid b/manifest.uuid
index d853015a651b1974a449fec36eaec7f0eb118b8a..9386e9ab660252da80a3b8e417a303948785cd28 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b22cdd6734ecda2b2b9749668f353abc2660f192d6a40c5d266309d30e25695e
\ No newline at end of file
+9780b23ca375de6a542516fbc03eb39d5a393ca577718fda231d0d0ccf3b1c7e
\ No newline at end of file

diff --git a/src/util.c b/src/util.c
index 09f7e051a903aef91be048bd493d13d79ee0ff48..ebcc5bec6e098d4f887c25452195bcc206d05d77 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -492,7 +492,7 @@ do_atof_calc:
             result = 0.0*s;
           }else{
 #ifdef INFINITY
-            result = INFINITY;
+            result = INFINITY*s;
 #else
             result = 1e308*1e308*s;  /* Infinity */
 #endif

diff --git a/test/nan.test b/test/nan.test
index 27fa04a3517a8106427018a62483243bb7ee3cb6..615a4ad22762939530fe714f6b3950cf3e2bf655 100644 (file)
--- a/test/nan.test
+++ b/test/nan.test
@@ -366,8 +366,10 @@ do_realnum_test nan-4.35 {
   }
 } {0.0 real}
 
-  
-
-
+do_realnum_test nan-4.40 {
+  db eval {
+    SELECT cast('-1e999' AS real);
+  }
+} {-inf}
 
 finish_test