From: drh <>
Date: Tue, 20 Feb 2024 13:11:27 +0000 (+0000)
Subject: Remove an unreachable branch from printf().  Change it into an assert().
X-Git-Tag: version-3.46.0~202
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b468e6832288292695ff5dc6782dd1e5334ee8f6;p=thirdparty%2Fsqlite.git

Remove an unreachable branch from printf().  Change it into an assert().

FossilOrigin-Name: 4c9886b692706723f4b68f58dfef07ab19b192fd19b953917f23b55655af3e02
---

diff --git a/manifest b/manifest
index abca404cf5..40152b32a7 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\san\sunused\svariable\sfrom\sthe\smerge\sin\sthe\sprevious\scheck-in.
-D 2024-02-20T13:10:46.615
+C Remove\san\sunreachable\sbranch\sfrom\sprintf().\s\sChange\sit\sinto\san\sassert().
+D 2024-02-20T13:11:27.626
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -735,7 +735,7 @@ F src/pcache1.c 602acb23c471bb8d557a6f0083cc2be641d6cafcafa19e481eba7ef4c9ca0f00
 F src/pragma.c f35ba8fb0b3782ef671cc38b3cdaa457e82befe022558f343240344e57d5f5f4
 F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
 F src/prepare.c 371f6115cb69286ebc12c6f2d7511279c2e47d9f54f475d46a554d687a3b312c
-F src/printf.c d3392b2a20ee314ddeef34fb43c904bf4619eb20ff9a9e07e3950a7e4dcd6912
+F src/printf.c 10e8bad30042f8bd6114a013b4afc229ec8ad255ab27518d7d9f52e8cbc5cd0a
 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c d77c6160bc8f249c2196fdd3e75f66a1dd70e37aa25c39aedc7b1f93c42b7c6d
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
@@ -2162,8 +2162,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 63ef234e88857a653fa3541e80d59802ceccb806ac8296e8bae79a385b7086f7
-R a21cfe7fc11d4cc3af701137f92d89ba
+P 5c26bf379e18e28d800525bd03e2d5597e2f37674979302f351b99abfc064749
+R 521cc3374b233ca8db7b57619e6235d0
 U drh
-Z d6568f521192ee23916aac9c92a235a6
+Z f1be525f7ee6098da75f01bd7c5e0ac8
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 262b24e277..a714b19d22 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5c26bf379e18e28d800525bd03e2d5597e2f37674979302f351b99abfc064749
\ No newline at end of file
+4c9886b692706723f4b68f58dfef07ab19b192fd19b953917f23b55655af3e02
\ No newline at end of file
diff --git a/src/printf.c b/src/printf.c
index 2e09431bf2..186e95bb85 100644
--- a/src/printf.c
+++ b/src/printf.c
@@ -534,13 +534,14 @@ void sqlite3_str_vappendf(
         }
 
         exp = s.iDP-1;
-        if( xtype==etGENERIC && precision>0 ) precision--;
 
         /*
         ** If the field type is etGENERIC, then convert to either etEXP
         ** or etFLOAT, as appropriate.
         */
         if( xtype==etGENERIC ){
+          assert( precision>0 );
+          precision--;
           flag_rtz = !flag_alternateform;
           if( exp<-4 || exp>precision ){
             xtype = etEXP;