From: drh <drh@noemail.net>
Date: Tue, 8 May 2018 13:03:31 +0000 (+0000)
Subject: Fix a harmless compiler warning in fuzzcheck.  Add new OSSFuzz test cases
X-Git-Tag: version-3.24.0~57
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f2cf412a0a17bb20869bb29f82b7f763c17a4730;p=thirdparty%2Fsqlite.git

Fix a harmless compiler warning in fuzzcheck.  Add new OSSFuzz test cases
to the test case library.

FossilOrigin-Name: d2619746cb233f4be127a77988548dd1d90eebddf0d0ac9107913b240553e5d0
---

diff --git a/manifest b/manifest
index eb997c914d..a782d84718 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fuzz\stest\scases\sfor\sUPSERT.
-D 2018-05-08T12:49:53.757
+C Fix\sa\sharmless\scompiler\swarning\sin\sfuzzcheck.\s\sAdd\snew\sOSSFuzz\stest\scases\nto\sthe\stest\scase\slibrary.
+D 2018-05-08T13:03:31.809
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in bfc40f350586923e0419d2ea4b559c37ec10ee4b6e210e08c14401f8e340f0da
@@ -940,12 +940,12 @@ F test/fuzz2.test 76dc35b32b6d6f965259508508abce75a6c4d7e1
 F test/fuzz3.test 9c813e6613b837cb7a277b0383cd66bfa07042b4cf0317157c35852f30043c31
 F test/fuzz_common.tcl a87dfbb88c2a6b08a38e9a070dabd129e617b45b
 F test/fuzz_malloc.test 5b257a7652d8ee90b22e9cf80d9dbea31a4f3e6fed1d33de57b24b1bdb211d79
-F test/fuzzcheck.c ee575af6aaf2895a747592377719fb41f372407ef2026724f2bd16ff2985bbda
+F test/fuzzcheck.c 3885207dc217c4dcdb2de4a3cb169a263afeef51ab9bd0ba8567289f0a19a470
 F test/fuzzdata1.db 7ee3227bad0e7ccdeb08a9e6822916777073c664
 F test/fuzzdata2.db f03a420d3b822cc82e4f894ca957618fbe9c4973
 F test/fuzzdata3.db c6586d3e3cef0fbc18108f9bb649aa77bfc38aba
 F test/fuzzdata4.db 1882f0055fb63214d8407ddc7aca9b0b1c59af21
-F test/fuzzdata5.db 9f0cdcc5c6e83b90cf9ae343bd07f684d2da2de7
+F test/fuzzdata5.db 117d821cde02e30a687f6361a34b98e6e0b05062df523cfee163c58564403b68
 F test/fuzzdata6.db 92a80e4afc172c24f662a10a612d188fb272de4a9bd19e017927c95f737de6d7
 F test/fuzzer1.test 3d4c4b7e547aba5e5511a2991e3e3d07166cfbb8
 F test/fuzzer2.test a85ef814ce071293bce1ad8dffa217cbbaad4c14
@@ -1728,7 +1728,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 a68697d10ef17d452c8279181186faad7bc54e3a35858a336552f717449065ea
-R 1614ac69cf68c4d847f0ba99f9a25462
+P fd11fbd21893d520de5a2249f825ecb5839fa4943f5c207e9e9bf8b52f4e2695
+R 341265b3833d05f56ac0f5a3c8e3d52d
 U drh
-Z 407f037ea974d860203a22f1c66f9cc1
+Z a9f407a471f5847cacaf3cf8ae748002
diff --git a/manifest.uuid b/manifest.uuid
index 9a55fdbd56..30835e6856 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fd11fbd21893d520de5a2249f825ecb5839fa4943f5c207e9e9bf8b52f4e2695
\ No newline at end of file
+d2619746cb233f4be127a77988548dd1d90eebddf0d0ac9107913b240553e5d0
\ No newline at end of file
diff --git a/test/fuzzcheck.c b/test/fuzzcheck.c
index 2ad382859b..05d944758e 100644
--- a/test/fuzzcheck.c
+++ b/test/fuzzcheck.c
@@ -862,14 +862,14 @@ int main(int argc, char **argv){
   int ossFuzzThisDb = 0;       /* ossFuzz value for this particular database */
   int nativeMalloc = 0;        /* Turn off MEMSYS3/5 and lookaside if true */
   sqlite3_vfs *pDfltVfs;       /* The default VFS */
-  int openFlags;               /* Flags for sqlite3_open_v2() */
+  int openFlags4Data;          /* Flags for sqlite3_open_v2() */
 
   iBegin = timeOfDay();
 #ifdef __unix__
   signal(SIGALRM, timeoutHandler);
 #endif
   g.zArgv0 = argv[0];
-  openFlags = SQLITE_OPEN_READONLY;
+  openFlags4Data = SQLITE_OPEN_READONLY;
   zFailCode = getenv("TEST_FAILURE");
   pDfltVfs = sqlite3_vfs_find(0);
   inmemVfsRegister(1);
@@ -912,19 +912,19 @@ int main(int argc, char **argv){
       if( strcmp(z,"load-sql")==0 ){
         zInsSql = "INSERT INTO xsql(sqltext)VALUES(CAST(readfile(?1) AS text))";
         iFirstInsArg = i+1;
-        openFlags = SQLITE_OPEN_READWRITE|SQLITE_OPEN_CREATE;
+        openFlags4Data = SQLITE_OPEN_READWRITE|SQLITE_OPEN_CREATE;
         break;
       }else
       if( strcmp(z,"load-db")==0 ){
         zInsSql = "INSERT INTO db(dbcontent) VALUES(readfile(?1))";
         iFirstInsArg = i+1;
-        openFlags = SQLITE_OPEN_READWRITE|SQLITE_OPEN_CREATE;
+        openFlags4Data = SQLITE_OPEN_READWRITE|SQLITE_OPEN_CREATE;
         break;
       }else
       if( strcmp(z,"m")==0 ){
         if( i>=argc-1 ) fatalError("missing arguments on %s", argv[i]);
         zMsg = argv[++i];
-        openFlags = SQLITE_OPEN_READWRITE|SQLITE_OPEN_CREATE;
+        openFlags4Data = SQLITE_OPEN_READWRITE|SQLITE_OPEN_CREATE;
       }else
       if( strcmp(z,"native-malloc")==0 ){
         nativeMalloc = 1;
@@ -945,7 +945,7 @@ int main(int argc, char **argv){
       }else
       if( strcmp(z,"rebuild")==0 ){
         rebuildFlag = 1;
-        openFlags = SQLITE_OPEN_READWRITE;
+        openFlags4Data = SQLITE_OPEN_READWRITE;
       }else
       if( strcmp(z,"result-trace")==0 ){
         runFlags |= SQL_OUTPUT;
@@ -991,7 +991,7 @@ int main(int argc, char **argv){
   /* Process each source database separately */
   for(iSrcDb=0; iSrcDb<nSrcDb; iSrcDb++){
     rc = sqlite3_open_v2(azSrcDb[iSrcDb], &db,
-                         openFlags, pDfltVfs->zName);
+                         openFlags4Data, pDfltVfs->zName);
     if( rc ){
       fatalError("cannot open source database %s - %s",
       azSrcDb[iSrcDb], sqlite3_errmsg(db));
diff --git a/test/fuzzdata5.db b/test/fuzzdata5.db
index 4645b1921b..55089e1f56 100644
Binary files a/test/fuzzdata5.db and b/test/fuzzdata5.db differ