Improvements to the -fsanitize=fuzzer based database file fuzzer.

(Cherrypick from the rubust-against-damaged-db branch.)

FossilOrigin-Name: 3cc01a0eaf54e3d5adf206825cfcab15edf73bd5aea10dfc497efd78071a17d0

diff --git a/manifest b/manifest
index 0eca201021901ad3361b223fb7561e3b39f87d79..01be0dac6894bf1a9cfb05ba6dc16dd81c265f51 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\sthe\sCLI,\swhen\sopening\sa\sfile\sthat\sbegins\swith\sthe\snormal\sSQLite\sprefix,\nopen\sthe\sfile\sas\sa\snormal\sdatabase\seven\sif\sit\shas\sa\sZIP\sfor\sAppendVFS\srecord\nat\sthe\send.
-D 2018-10-30T14:36:21.740
+C Improvements\sto\sthe\s-fsanitize=fuzzer\sbased\sdatabase\sfile\sfuzzer.\n(Cherrypick\sfrom\sthe\srubust-against-damaged-db\sbranch.)
+D 2018-10-30T15:20:35.806
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 64113b9c489de88bf5ea29d7426fa3f63938ee5f5e4a4fea1f6e62a25efba177
@@ -771,7 +771,7 @@ F test/date.test 9b73bbeb1b82d9c1f44dec5cf563bf7da58d2373
 F test/date2.test 74c234bece1b016e94dd4ef9c8cc7a199a8806c0e2291cab7ba64bace6350b10
 F test/dbfuzz.c 73047c920d6210e5912c87cdffd9a1c281d4252e
 F test/dbfuzz2-seed1.db e6225c6f3d7b63f9c5b6867146a5f329d997ab105bee64644dc2b3a2f2aebaee
-F test/dbfuzz2.c fae8599108dbf6460f8862677a22ee517c9030cdd931df0ed3c66c09ab14e46a
+F test/dbfuzz2.c 652f85bac1770e927da139db513234a3eba308f72ac2f8b32f0093d7d19def70
 F test/dbpage.test dbf50a4d361f9e45a979432c727506065113124478a7d2db12074fa655e65d6c
 F test/dbstatus.test cd83aa623b8aab477269bc94cf8aa90c1e195a144561dd04a1620770aaa8524e
 F test/dbstatus2.test f5fe0afed3fa45e57cfa70d1147606c20d2ba23feac78e9a172f2fe8ab5b78ef
@@ -1774,7 +1774,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 5e0129ee9afa7c2d707f8ac9e29ef3583c49bb1d0965085c067d58f828ac8cdf
-R 483e69e1ee704e97514f1a28385e28f9
+P 7989bbda70a24611c3b8af96a53114bb53d87a2e1145ec7ad4f1b4cbf8d6040c
+Q +585c94db09d21ce5c5275537014ba5cfe75d4df9274d6fd8d07f754e4aa2c640
+R 3505f0f95a3c0f6a209b5970a7392158
 U drh
-Z a4c51b591abc7bf95f3ada3df5e196d6
+Z 0539ca60fda1fb5b50f26b7720439a51

diff --git a/manifest.uuid b/manifest.uuid
index 59244856d34c8d905cf06e7256be57a513f537f3..c3b795d486328009e41ebacee11f0c3c8f528e44 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7989bbda70a24611c3b8af96a53114bb53d87a2e1145ec7ad4f1b4cbf8d6040c
\ No newline at end of file
+3cc01a0eaf54e3d5adf206825cfcab15edf73bd5aea10dfc497efd78071a17d0
\ No newline at end of file

diff --git a/test/dbfuzz2.c b/test/dbfuzz2.c
index 27be2b52598544979c758d9880fc2094be856317..0833f038688451c5a1d602402850bcd5a1d8d44d 100644 (file)
--- a/test/dbfuzz2.c
+++ b/test/dbfuzz2.c
@@ -78,9 +78,9 @@ int LLVMFuzzerTestOneInput(const uint8_t *aData, size_t nByte){
     printf("************** nByte=%d ***************\n", (int)nByte);
     fflush(stdout);
   }
-  rc = sqlite3_open(":memory:", &db);
+  rc = sqlite3_open(0, &db);
   if( rc ) return 1;
-  a = sqlite3_malloc64(nByte);
+  a = sqlite3_malloc64(nByte+1);
   if( a==0 ) return 1;
   memcpy(a, aData, nByte);
   sqlite3_deserialize(db, "main", a, nByte, nByte,
@@ -93,9 +93,16 @@ int LLVMFuzzerTestOneInput(const uint8_t *aData, size_t nByte){
     }
     sqlite3_exec(db, azSql[i], 0, 0, 0);
   }
-  sqlite3_close(db);
+  rc = sqlite3_close(db);
+  if( rc!=SQLITE_OK ){
+    fprintf(stdout, "sqlite3_close() returns %d\n", rc);
+  }
   if( sqlite3_memory_used()!=0 ){
-    fprintf(stderr,"Memory leak: %lld bytes\n", sqlite3_memory_used());
+    int nAlloc = 0;
+    int nNotUsed = 0;
+    sqlite3_status(SQLITE_STATUS_MALLOC_COUNT, &nAlloc, &nNotUsed, 0);
+    fprintf(stderr,"Memory leak: %lld bytes in %d allocations\n",
+            sqlite3_memory_used(), nAlloc);
     exit(1);
   }
   return 0;