Better job at suppressing harmless scan-build warnings. This time testing

and working.

FossilOrigin-Name: c847973947de67579fab78a65ecfc90bf59fd5db0b7fa7a9c1abb1fc92213d01

diff --git a/manifest b/manifest
index 6f043074b996aadbab470fc9d1e29bd968c12054..cf63954c977f2a1c84408afadb73597b5263eae5 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\sscan-build\swarnings.
-D 2025-01-11T13:59:42.950
+C Better\sjob\sat\ssuppressing\sharmless\sscan-build\swarnings.\s\sThis\stime\stesting\nand\sworking.
+D 2025-01-11T14:43:47.901
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -728,7 +728,7 @@ F src/date.c 89ce1ff20512a7fa5070ba6e7dd5c171148ca7d580955795bf97c79c2456144a
 F src/dbpage.c e90410e5d4c0217dfddc4184a81e38ec4903c25d4ec0f201060a0e54e7c2099f
 F src/dbstat.c 73362c0df0f40ad5523a6f5501224959d0976757b511299bf892313e79d14f5c
 F src/delete.c 03a77ba20e54f0f42ebd8eddf15411ed6bdb06a2c472ac4b6b336521bf7cea42
-F src/expr.c bc600813682b849ef180fffd26fbb36397016366ac1246aa3d3d58f9a31f88f8
+F src/expr.c 30a407765d4e4b592f9f958085fb4e8336e54fa46a70ade7f5a67111bc191563
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 928ed2517e8732113d2b9821aa37af639688d752f4ea9ac6e0e393d713eeb76f
 F src/func.c 89b733a5f513c4bc06b7271384363d5693d62782de8295bc87b97d79862c9714
@@ -779,7 +779,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c c8a5372b97b2a2e972a280676f06ddb5b74e885d3b1f5ce383f839907b57ef68
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c 83e88fbb36f89b6703b348777491619554f0fd6f917c9fdf51e4c2e9cda6c04e
-F src/shell.c.in d6d1901fda17a7ab5443e6a6fbc3ca523c01c85058cf0d3ce2e2e5c2e898915e
+F src/shell.c.in aca84434e73942aaaefdba3790fd147c75f73f7c6908959cf2d5cd6a53e8ee76
 F src/sqlite.h.in 6afbcaae44140216704a6c82e4c4ea4118c46d5f6573d6c5fa4fc901ed9d369e
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
@@ -2205,8 +2205,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 99917a5bb04b5ad6ace95baf86d91e6ce098f9d3001de1a29d3d0b0b817acdce
-R 4a4f027b9e85dc62acdf46f689ae54cd
+P b93af6feb7c0c3af30a47810a7c0e77ce41c386fac164c64bb5871a6c153db7e
+R ae54af26d9f89a39f6b222b17c0e4b08
 U drh
-Z a5dd0b9f1006749b9a2e9efcfdf75968
+Z 623dab57f8e4a45135026255ca9de26f
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 034199fd7d62677be3547a92a3a4bcfeeb5560ae..16c5fbe1c6b21c276224d29387ad6c235d4a445e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b93af6feb7c0c3af30a47810a7c0e77ce41c386fac164c64bb5871a6c153db7e
+c847973947de67579fab78a65ecfc90bf59fd5db0b7fa7a9c1abb1fc92213d01

diff --git a/src/expr.c b/src/expr.c
index 8c118d0779e058f9ccc19f54a7179aaf998470e2..ca5b9092e7586c95179bd7eb7e9f25df47f2be06 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -3285,7 +3285,7 @@ int sqlite3FindInIndex(
             if( aiMap ) aiMap[i] = j;
           }
  
-          assert( nExpr<BMS );
+          assert( nExpr>0 && nExpr<BMS );
           assert( i==nExpr || colUsed!=(MASKBIT(nExpr)-1) );
           if( colUsed==(MASKBIT(nExpr)-1) ){
             /* If we reach this point, that means the index pIdx is usable */

diff --git a/src/shell.c.in b/src/shell.c.in
index 4da92072d71766f48348bbe230814decffe2859b..db0604eb181b9980331844edb94eb6ac98f88635 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -10122,6 +10122,7 @@ static int do_meta_command(char *zLine, ShellState *p){
 #else
       FILE *pfPipe = sqlite3_popen(zFile + 1, "w");
       if( pfPipe==0 ){
+        assert( stderr!=NULL );
         sqlite3_fprintf(stderr,"Error: cannot open pipe \"%s\"\n", zFile + 1);
         rc = 1;
       }else{
@@ -10134,7 +10135,8 @@ static int do_meta_command(char *zLine, ShellState *p){
       FILE *pfFile = output_file_open(zFile);
       if( pfFile==0 ){
         if( cli_strcmp(zFile,"off")!=0 ){
-          sqlite3_fprintf(stderr,"Error: cannot write to \"%s\"\n", zFile);
+         assert( stderr!=NULL );
+         sqlite3_fprintf(stderr,"Error: cannot write to \"%s\"\n", zFile);
         }
         rc = 1;
       } else {