Fix harmless compiler warnings in fuzzcheck
FossilOrigin-Name: a82539665718c8183d9d0bb7bcb3adcb1a23294b8c30f364829a982dab89a332
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
C Fix\sa\ssegfault\sthat\scould\sfollow\san\sOOM\swhen\squerying\sa\stable\sthat\shas\sone\sor\smore\scolumns\swith\sdefault\svalues\s"true"\sor\s"false".
|
||||
D 2019-01-25T17:26:59.972
|
||||
C Fix\sharmless\scompiler\swarnings\sin\sfuzzcheck
|
||||
D 2019-01-25T17:51:06.963
|
||||
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
|
||||
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
|
||||
F Makefile.in 9947eae873c07ae894d4c8633b76c0a0daca7b9fd54401096a77d1a6c7b74359
|
||||
@@ -984,7 +984,7 @@ F test/fuzz3.test 9c813e6613b837cb7a277b0383cd66bfa07042b4cf0317157c35852f30043c
|
||||
F test/fuzz4.test c229bcdb45518a89e1d208a21343e061503460ac69fae1539320a89f572eb634
|
||||
F test/fuzz_common.tcl a87dfbb88c2a6b08a38e9a070dabd129e617b45b
|
||||
F test/fuzz_malloc.test f348276e732e814802e39f042b1f6da6362a610af73a528d8f76898fde6b22f2
|
||||
F test/fuzzcheck.c b72e92f38747e4fe45b4df41a750a9ee3797f28e808c11b753d91d750a559c51
|
||||
F test/fuzzcheck.c 4081b21460ce1f65b5904bdca27cf437476b414bf3f031fd4d6dfec58694b591
|
||||
F test/fuzzdata1.db 7ee3227bad0e7ccdeb08a9e6822916777073c664
|
||||
F test/fuzzdata2.db 128b3feeb78918d075c9b14b48610145a0dd4c8d6f1ca7c2870c7e425f5bf31f
|
||||
F test/fuzzdata3.db c6586d3e3cef0fbc18108f9bb649aa77bfc38aba
|
||||
@@ -1804,7 +1804,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 93f8ec146d63af13f04e337ada4fa75e9254f72b1394df09701ae12e185f27e2
|
||||
R 2cb8f8fb2b4ff17e3505a36e4fc9e6eb
|
||||
U dan
|
||||
Z 9cb6325f7d75df66f5e002f08abd824a
|
||||
P 202f9919c222ee933924c63c15ad36ec4481457b1e4d9179af14c9f284117c0c
|
||||
R 5993301b53e351451822ca9138373189
|
||||
U drh
|
||||
Z 28dd075cf2a9d09311894c57cd8c7c5a
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
202f9919c222ee933924c63c15ad36ec4481457b1e4d9179af14c9f284117c0c
|
||||
a82539665718c8183d9d0bb7bcb3adcb1a23294b8c30f364829a982dab89a332
|
||||
+10
-10
@@ -445,7 +445,7 @@ static int eVerbosity = 0;
|
||||
static int bVdbeDebug = 0;
|
||||
|
||||
/* Timeout for each fuzzing attempt, in milliseconds */
|
||||
static int iTimeout = 10000; /* Defaults to 10 seconds */
|
||||
static int giTimeout = 10000; /* Defaults to 10 seconds */
|
||||
|
||||
/* Maximum number of progress handler callbacks */
|
||||
static unsigned int mxProgressCb = 2000;
|
||||
@@ -464,7 +464,7 @@ static sqlite3_int64 maxDbSize = 104857600;
|
||||
** This routine only works if h really is a valid hexadecimal
|
||||
** character: 0..9a..fA..F
|
||||
*/
|
||||
static unsigned int hexToInt(unsigned int h){
|
||||
static unsigned char hexToInt(unsigned int h){
|
||||
#ifdef SQLITE_EBCDIC
|
||||
h += 9*(1&~(h>>4)); /* EBCDIC */
|
||||
#else
|
||||
@@ -526,7 +526,7 @@ static int decodeDatabase(
|
||||
unsigned char b = 0;
|
||||
if( nIn<4 ) return -1;
|
||||
n = (unsigned int)nIn;
|
||||
a = sqlite3_malloc( nAlloc );
|
||||
a = sqlite3_malloc64( nAlloc );
|
||||
if( a==0 ){
|
||||
fprintf(stderr, "Out of memory!\n");
|
||||
exit(1);
|
||||
@@ -562,7 +562,7 @@ static int decodeDatabase(
|
||||
}
|
||||
newSize = MX_FILE_SZ;
|
||||
}
|
||||
a = sqlite3_realloc( a, newSize );
|
||||
a = sqlite3_realloc64( a, newSize );
|
||||
if( a==0 ){
|
||||
fprintf(stderr, "Out of memory!\n");
|
||||
exit(1);
|
||||
@@ -744,7 +744,7 @@ int runCombinedDbSqlInput(const uint8_t *aData, size_t nByte){
|
||||
memset(&cx, 0, sizeof(cx));
|
||||
iSql = decodeDatabase((unsigned char*)aData, (int)nByte, &aDb, &nDb);
|
||||
if( iSql<0 ) return 0;
|
||||
nSql = nByte - iSql;
|
||||
nSql = (int)(nByte - iSql);
|
||||
if( eVerbosity>=3 ){
|
||||
printf(
|
||||
"****** %d-byte input, %d-byte database, %d-byte script "
|
||||
@@ -759,11 +759,11 @@ int runCombinedDbSqlInput(const uint8_t *aData, size_t nByte){
|
||||
|
||||
/* Invoke the progress handler frequently to check to see if we
|
||||
** are taking too long. The progress handler will return true
|
||||
** (which will block further processing) if more than iTimeout seconds have
|
||||
** (which will block further processing) if more than giTimeout seconds have
|
||||
** elapsed since the start of the test.
|
||||
*/
|
||||
cx.iLastCb = timeOfDay();
|
||||
cx.iCutoffTime = cx.iLastCb + iTimeout; /* Now + iTimeout seconds */
|
||||
cx.iCutoffTime = cx.iLastCb + giTimeout; /* Now + giTimeout seconds */
|
||||
cx.mxCb = mxProgressCb;
|
||||
#ifndef SQLITE_OMIT_PROGRESS_CALLBACK
|
||||
sqlite3_progress_handler(cx.db, 10, progress_handler, (void*)&cx);
|
||||
@@ -1454,10 +1454,10 @@ int main(int argc, char **argv){
|
||||
}else
|
||||
if( strcmp(z,"version")==0 ){
|
||||
int ii;
|
||||
const char *z;
|
||||
const char *zz;
|
||||
printf("SQLite %s %s\n", sqlite3_libversion(), sqlite3_sourceid());
|
||||
for(ii=0; (z = sqlite3_compileoption_get(ii))!=0; ii++){
|
||||
printf("%s\n", z);
|
||||
for(ii=0; (zz = sqlite3_compileoption_get(ii))!=0; ii++){
|
||||
printf("%s\n", zz);
|
||||
}
|
||||
return 0;
|
||||
}else
|
||||
|
||||
Reference in New Issue
Block a user