From: drh <>
Date: Fri, 30 Jun 2023 11:51:36 +0000 (+0000)
Subject: Make the sum() function less precise and slower in order to avoid
X-Git-Tag: version-3.43.0~167
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=60f41362cfa65da5baa992367156f67d738e1be3;p=thirdparty%2Fsqlite.git

Make the sum() function less precise and slower in order to avoid
harmless signed integer overflow UBSAN warnings from OSS-Fuzz.

FossilOrigin-Name: 1be0646a2c352dbf03d2af87fd48b6f9edfd68666790ac6863144ac95f3e0621
---

diff --git a/manifest b/manifest
index b40dd24f82..f0a9697ea1 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Cleanup\sand\scommenting\sof\sthe\snew\sDECIMAL\sextension\scode.\s\sNo\sfunctional\nchanges.
-D 2023-06-29T23:03:30.242
+C Make\sthe\ssum()\sfunction\sless\sprecise\sand\sslower\sin\sorder\sto\savoid\nharmless\ssigned\sinteger\soverflow\sUBSAN\swarnings\sfrom\sOSS-Fuzz.
+D 2023-06-30T11:51:36.400
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -590,7 +590,7 @@ F src/delete.c cd5f5cd06ed0b6a882ec1a8c2a0d73b3cecb28479ad19e9931c4706c5e2182be
 F src/expr.c 8d1656b65e26af3e34f78e947ac423f0d20c214ed25a67486e433bf16ca6b543
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c a7fcbf7e66d14dbb73cf49f31489ebf66d0e6006c62b95246924a3bae9f37b36
-F src/func.c 8ada46d362a153b8dfb5385c3aaa9a7d75ebf306b33d2e663aa03920126a1bc3
+F src/func.c 09a742d1f3363f57b774c227a794f7597d73c3fcfd3a2b430aa99cd718b78d73
 F src/global.c bd0892ade7289f6e20bff44c07d06371f2ff9b53cea359e7854b9b72f65adc30
 F src/hash.c 9ee4269fb1d6632a6fecfb9479c93a1f29271bddbbaf215dd60420bcb80c7220
 F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
@@ -705,7 +705,7 @@ F src/trigger.c ad6ab9452715fa9a8075442e15196022275b414b9141b566af8cdb7a1605f2b0
 F src/update.c 0aa36561167a7c40d01163238c297297962f31a15a8d742216b3c37cdf25f731
 F src/upsert.c 5303dc6c518fa7d4b280ec65170f465c7a70b7ac2b22491598f6d0b4875b3145
 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
-F src/util.c a6b41c67ff2a5379b46b77e587b2e0adb2d2ddcc5669691674ca4d28e2755ae4
+F src/util.c 9ee7bc23c0f91b48961e2010ef8b666b20ed35ee70418940e7838f63b6403a0e
 F src/vacuum.c 604fcdaebe76f3497c855afcbf91b8fa5046b32de3045bab89cc008d68e40104
 F src/vdbe.c c993304c609326cf625b4ad30cbb0e15a3f64c941cf2c9713d0c360b4abbaa98
 F src/vdbe.h 41485521f68e9437fdb7ec4a90f9d86ab294e9bb8281e33b235915e29122cfc0
@@ -1107,7 +1107,7 @@ F test/fts4umlaut.test fcaca4471de7e78c9d1f7e8976e3e8704d7d8ad979d57a739d00f3f75
 F test/fts4unicode.test 82a9c16b68ba2f358a856226bb2ee02f81583797bc4744061c54401bf1a0f4c9
 F test/fts4upfrom.test f25835162c989dffd5e2ef91ec24c4848cc9973093e2d492d1c7b32afac1b49d
 F test/full.test 6b3c8fb43c6beab6b95438c1675374b95fab245d
-F test/func.test 14ec60fd0cc4182e285e403b91e916e6c45597786347d9d5e59415cb4b130942
+F test/func.test ee6e8c5f74b8e02a873d76ecac7a4116cf61ba908b4ecda6c98b63867d138a1d
 F test/func2.test 772d66227e4e6684b86053302e2d74a2500e1e0f
 F test/func3.test 600a632c305a88f3946d38f9a51efe145c989b2e13bd2b2a488db47fe76bab6a
 F test/func4.test 2285fb5792d593fef442358763f0fd9de806eda47dbc7a5934df57ffdc484c31
@@ -2041,8 +2041,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 8baf8c10aecb261751f2b154356ab224b79d07230929ec9f123791278e601bba
-R 675d9c81a919ee8e5fecf85fab690bbe
+P 5124481663eb8e74a9f861be98adb7075ea911fcff0216d98c658e955acadf14
+R 77794eb101d1ce0bdf15ea60fb4ced31
 U drh
-Z 280a7e7c456f8f31c265ce2d679ab403
+Z b3abc59caff200e4a3d3dc249d24e32e
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 4f0273de25..a7ad2a52e5 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5124481663eb8e74a9f861be98adb7075ea911fcff0216d98c658e955acadf14
\ No newline at end of file
+1be0646a2c352dbf03d2af87fd48b6f9edfd68666790ac6863144ac95f3e0621
\ No newline at end of file
diff --git a/src/func.c b/src/func.c
index c505c37d69..75a07e63f9 100644
--- a/src/func.c
+++ b/src/func.c
@@ -1740,8 +1740,13 @@ static void sumFinalize(sqlite3_context *context){
     if( p->approx ){
       sqlite3_result_double(context, p->rSum[0]+p->rSum[1]);
     }else{
-      i64 v = (i64)p->rSum[0] + (i64)p->rSum[1];
+      double r = p->rSum[0] + p->rSum[1];
+      i64 v;
       double y[2], z[2];
+      v = sqlite3RealToI64(p->rSum[0]);
+      if( sqlite3AddInt64(&v, sqlite3RealToI64(p->rSum[1])) ){
+        v = 0;
+      }
       sqlite3DDFromInt(v, y);
       sqlite3DDSub(y[0], y[1], p->rSum[0], p->rSum[1], z);
       if( z[0] + z[1] != 0.0 ){
diff --git a/src/util.c b/src/util.c
index 256ec7c5c7..ab8560839a 100644
--- a/src/util.c
+++ b/src/util.c
@@ -1761,8 +1761,14 @@ int sqlite3VListNameToNum(VList *pIn, const char *zName, int nName){
 
 /* Compute z = (i64)x */
 void sqlite3DDFromInt(i64 x, double *z){
-  z[0] = (double)x;
-  z[1] = (double)(x - (i64)z[0]);
+  if( x > -4503599627370496L && x < 4503599627370496 ){
+    z[0] = (double)x;
+    z[1] = 0.0;
+  }else{
+    i64 y = x % 2048;
+    z[0] = (double)(x - y);
+    z[1] = (double)(x - (i64)z[0]);
+  }
 }
 
 /* Compute z = x + y */
diff --git a/test/func.test b/test/func.test
index d5ba5d02ac..b6884e7cf5 100644
--- a/test/func.test
+++ b/test/func.test
@@ -910,7 +910,7 @@ if {[working_64bit_int]} {
          (SELECT 9223372036854775807 AS x UNION ALL
           SELECT -10 AS x);
     }
-  } {0 9223372036854775797}
+  } {1 {integer overflow}}
   do_test func-18.17 {
     catchsql {
       SELECT sum(x) FROM 
@@ -1557,8 +1557,8 @@ do_catchsql_test func-37.110 {
   SELECT sum(x) FROM c;
 } {1 {integer overflow}}
 do_catchsql_test func-37.120 {
-  WITH c(x) AS (VALUES(9223372036854775807),(100),(-101))
+  WITH c(x) AS (VALUES(9223372036854775807),(10000),(-10010))
   SELECT sum(x) FROM c;
-} {0 9223372036854775806}
+} {1 {integer overflow}}
 
 finish_test