From: drh <>
Date: Tue, 17 Mar 2026 09:18:36 +0000 (+0000)
Subject: Reorder bounds checking in sqlite3Fp10Convert2()
X-Git-Tag: major-release~78^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e9018e5ff534c834c0a05a29f1e9a482111cd28a;p=thirdparty%2Fsqlite.git

Reorder bounds checking in sqlite3Fp10Convert2()

FossilOrigin-Name: 23ad656edb3a63e7e6602770e1f2c4a5ef1f3d41565e7f13408b5305619dfa3d
---

diff --git a/manifest b/manifest
index 456d0c3a0c..0957ae5cc3 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improve\saccuracy\sof\stext&rarr;floating-point\sconversions\sby\smoving\nfrom\s64-bit\sto\s96-bit\sapproximations\sto\spowers\sof\sten.
-D 2026-03-16T09:40:12.692
+C Reorder\sbounds\schecking\sin\ssqlite3Fp10Convert2()
+D 2026-03-17T09:18:36.777
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -797,7 +797,7 @@ F src/trigger.c 4bf3bfb3851d165e4404a9f9e69357345f3f7103378c07e07139fdd8aeb7bd20
 F src/update.c 3e5e7ff66fa19ebe4d1b113d480639a24cc1175adbefabbd1a948a07f28e37cf
 F src/upsert.c 215328c3f91623c520ec8672c44323553f12caeb4f01b1090ebdca99fdf7b4f1
 F src/utf.c 7267c3fb9e2467020507601af3354c2446c61f444387e094c779dccd5ca62165
-F src/util.c bd95c3d6686d2a11c41fba6773bb9eea0f35f12acf61ba5209ac8df511828526
+F src/util.c ced03971dad5ae9418a2ced329506de16e5ff2ed7152e059400499332c1a593b
 F src/vacuum.c d3d35d8ae893d419ade5fa196d761a83bddcbb62137a1a157ae751ef38b26e82
 F src/vdbe.c 5328c99dd256ee8132383565a86e253543a85daccfd7477c52f20bac6b385a7f
 F src/vdbe.h 966d0677a540b7ea6549b7c4e1312fc0d830fce3a235a58c801f2cc31cf5ecf9
@@ -2192,11 +2192,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee
 F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
 F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
-P dc78d258745a1350685b37da56f0a2ac2e437b422415d634522dc61d340d06eb
-R f59b8c829bad07248a47e162ef692916
-T *branch * fp-accuracy
-T *sym-fp-accuracy *
-T -sym-trunk *
+P a19c0785dcfb9fb74963c45b161b12ac8f4379e2b990f6c5de0d7b959c5be98d
+R 31509aecbe36d702bbcca4c3d7b1c6e3
 U drh
-Z 19ea5a38045ee5939d5ca49387573c8e
+Z 3ad3a7a0646ac1e8f0a50096402694d2
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index a462b94d5f..44a851c32e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a19c0785dcfb9fb74963c45b161b12ac8f4379e2b990f6c5de0d7b959c5be98d
+23ad656edb3a63e7e6602770e1f2c4a5ef1f3d41565e7f13408b5305619dfa3d
diff --git a/src/util.c b/src/util.c
index 5fd004514a..8a31c29fec 100644
--- a/src/util.c
+++ b/src/util.c
@@ -748,6 +748,8 @@ static void sqlite3Fp2Convert10(u64 m, int e, int n, u64 *pD, int *pP){
 ** Return an IEEE754 floating point value that approximates d*pow(10,p).
 */
 static double sqlite3Fp10Convert2(u64 d, int p){
+  if( p<POWERSOF10_FIRST ) return 0.0;
+  if( p>POWERSOF10_LAST ) return INFINITY;
   int b = 64 - countLeadingZeros(d);
   int lp = pwr10to2(p);
   int e = 53 - b - lp;
@@ -755,8 +757,6 @@ static double sqlite3Fp10Convert2(u64 d, int p){
     if( e>=1130 ) return 0.0;
     e = 1074;
   }
-  if( p<POWERSOF10_FIRST ) return 0.0;
-  if( p>POWERSOF10_LAST ) return INFINITY;
   int s = -(e-(64-b) + lp + 3);
   u32 pwr10l;
   u64 pwr10h = powerOfTen(p, &pwr10l);