Add assert()s in os_win.c in an effort to silence false-positives from

static analyzers.

FossilOrigin-Name: 22a7c15b262376fb0ce4dd3d044373380d86c5ccd96e2f24576cf04318597c33

diff --git a/manifest b/manifest
index f4503d9b6f9bc8b18f48b5f0eeec1c94a65ba037..061ebee2ca5beced0082fcdd1f2c1c5a3a92076a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Call\sioctl()\swith\sthe\scorrect\ssignature\son\sboth\sAndroid\sand\sstock\sLinux.
-D 2019-07-16T05:11:16.359
+C Add\sassert()s\sin\sos_win.c\sin\san\seffort\sto\ssilence\sfalse-positives\sfrom\nstatic\sanalyzers.
+D 2019-07-16T18:27:07.355
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -507,7 +507,7 @@ F src/os.h 48388821692e87da174ea198bf96b1b2d9d83be5dfc908f673ee21fafbe0d432
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
 F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
 F src/os_unix.c 7a2e00cf63588096f356451b7405bf9c7316e1cd8543a7cfbe64e8ffed2e3f34
-F src/os_win.c 85d9e532d0444ab6c16d7431490c2e279e282aa0917b0e988996b1ae0de5c5a0
+F src/os_win.c 035a813cbd17f355bdcad7ab894af214a9c13a1db8aeac902365350b98cd45a7
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c 422fd8cfa59fb9173eff36a95878904a0eeb0dcc62ba49350acc8b1e51c4dc7b
 F src/pager.h 217921e81eb5fe455caa5cda96061959706bcdd29ddb57166198645ef7822ac3
@@ -1835,8 +1835,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 52f463d29407fad691c42b13462880e7605603c9be9f480d18e953a0ef78149a 68e12e063fe41bcd65cf8a120f838b9b1723ed803ea85240fe0f2145b78df2d7
-R 1ddfb5d9b3cc78b453237f27b05e7d9c
-T +closed 68e12e063fe41bcd65cf8a120f838b9b1723ed803ea85240fe0f2145b78df2d7
-U dan
-Z 1d45fd94302d6b447ec50d51f5de73a4
+P 2422534908a85a4cd11784e4c23a74ad121404f73dade587bf27efde1e2b982b
+R 8000b05148840a2c9c085068b80fffe6
+U drh
+Z 2e7e9ebbdbaa32c1a82b9d9066c825bb

diff --git a/manifest.uuid b/manifest.uuid
index efe24d558e8c1449683039d41db83f80833decc8..ca294703cb4a3bb63f816ab1e4c8e6399eed5b41 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2422534908a85a4cd11784e4c23a74ad121404f73dade587bf27efde1e2b982b
\ No newline at end of file
+22a7c15b262376fb0ce4dd3d044373380d86c5ccd96e2f24576cf04318597c33
\ No newline at end of file

diff --git a/src/os_win.c b/src/os_win.c
index aafc89f7d2d5b912496dbdb2e0498c341cae75c5..32758ab760712a9b3d5957a5cf4c51ca355834b1 100644 (file)
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -4215,6 +4215,7 @@ static int winShmMap(
     rc = winOpenSharedMemory(pDbFd);
     if( rc!=SQLITE_OK ) return rc;
     pShm = pDbFd->pShm;
+    assert( pShm!=0 );
   }
   pShmNode = pShm->pShmNode;
 
@@ -4517,6 +4518,7 @@ static int winFetch(sqlite3_file *fd, i64 iOff, int nAmt, void **pp){
       }
     }
     if( pFd->mmapSize >= iOff+nAmt ){
+      assert( pFd->pMapRegion!=0 );
       *pp = &((u8 *)pFd->pMapRegion)[iOff];
       pFd->nFetchOut++;
     }