From 5de7d966bd1bd61d4a197585db449bd111f60cab Mon Sep 17 00:00:00 2001 From: drh Date: Fri, 5 Dec 2014 00:17:39 +0000 Subject: [PATCH 1/2] Fix the autoconf and MSVC makefiles, which have been broken for nearly a month. :-( FossilOrigin-Name: 520c2b838da8b230487c8c66f3ba8e5daa1ca886 --- Makefile.in | 1 + Makefile.msc | 1 + manifest | 14 +++++++------- manifest.uuid | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Makefile.in b/Makefile.in index 646cb39756..4929ce313c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -359,6 +359,7 @@ TESTSRC = \ $(TOP)/src/test_autoext.c \ $(TOP)/src/test_async.c \ $(TOP)/src/test_backup.c \ + $(TOP)/src/test_blob.c \ $(TOP)/src/test_btree.c \ $(TOP)/src/test_config.c \ $(TOP)/src/test_demovfs.c \ diff --git a/Makefile.msc b/Makefile.msc index 4aaa2894a7..64175a0679 100644 --- a/Makefile.msc +++ b/Makefile.msc @@ -828,6 +828,7 @@ TESTSRC = \ $(TOP)\src\test_autoext.c \ $(TOP)\src\test_async.c \ $(TOP)\src\test_backup.c \ + $(TOP)\src\test_blob.c \ $(TOP)\src\test_btree.c \ $(TOP)\src\test_config.c \ $(TOP)\src\test_demovfs.c \ diff --git a/manifest b/manifest index e3691737da..042ccce636 100644 --- a/manifest +++ b/manifest @@ -1,9 +1,9 @@ -C Make\ssure\sthat\sa\sDISTINCT\squery\swith\san\sORDER\sBY\sworks\scorrectly\seven\sif\nit\suses\sa\sdescending\sindex.\s\sFix\sfor\sticket\s[c5ea805691bfc4204b1cb9e]. -D 2014-12-04T21:54:58.307 +C Fix\sthe\sautoconf\sand\sMSVC\smakefiles,\swhich\shave\sbeen\sbroken\sfor\snearly\sa\nmonth.\s\s:-( +D 2014-12-05T00:17:39.977 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f -F Makefile.in a226317fdf3f4c895fb3cfedc355b4d0868ce1fb +F Makefile.in 6c4f961fa91d0b4fa121946a19f9e5eac2f2f809 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 -F Makefile.msc 788f1288633a0c3c3cbbe0f3e4827d033f7ba530 +F Makefile.msc 10720782f88648bf2b5dcedf4c1524b067d43e47 F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0 F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8 F VERSION d846487aff892625eb8e75960234e7285f0462fe @@ -1223,7 +1223,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 1461d543ac8a3e4a54405067893146c74576bb4e -R fc5b0159564faa200a156d134ab758df +P 0d3aef97ebddf422b8bdcbc5878970c6129e3f54 +R cd249245e23c4920ae8ada9787d27cef U drh -Z 018f1b0eb45096a13f52fc7d70ef2bc6 +Z 911d29bfeef3460d645482250c6ca2bc diff --git a/manifest.uuid b/manifest.uuid index 7416b1cda3..3768cb56eb 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -0d3aef97ebddf422b8bdcbc5878970c6129e3f54 \ No newline at end of file +520c2b838da8b230487c8c66f3ba8e5daa1ca886 \ No newline at end of file From 2c3abeb8c3c01c8f0143557a3bebddf5d5d26405 Mon Sep 17 00:00:00 2001 From: drh Date: Fri, 5 Dec 2014 00:32:09 +0000 Subject: [PATCH 2/2] Fix compiler warnings. FossilOrigin-Name: e9955c0e14d13ba1411f013acb4979958dae2516 --- ext/misc/eval.c | 19 +++++++++++-------- manifest | 14 +++++++------- manifest.uuid | 2 +- src/test1.c | 2 +- 4 files changed, 20 insertions(+), 17 deletions(-) diff --git a/ext/misc/eval.c b/ext/misc/eval.c index a5e297ad38..71b6b69f20 100644 --- a/ext/misc/eval.c +++ b/ext/misc/eval.c @@ -21,11 +21,11 @@ SQLITE_EXTENSION_INIT1 ** Structure used to accumulate the output */ struct EvalResult { - char *z; /* Accumulated output */ - const char *zSep; /* Separator */ - int szSep; /* Size of the separator string */ - int nAlloc; /* Number of bytes allocated for z[] */ - int nUsed; /* Number of bytes of z[] actually used */ + char *z; /* Accumulated output */ + const char *zSep; /* Separator */ + int szSep; /* Size of the separator string */ + sqlite3_int64 nAlloc; /* Number of bytes allocated for z[] */ + sqlite3_int64 nUsed; /* Number of bytes of z[] actually used */ }; /* @@ -37,10 +37,13 @@ static int callback(void *pCtx, int argc, char **argv, char **colnames){ for(i=0; inUsed+p->szSep+1 > p->nAlloc ){ + if( (sqlite3_int64)sz+p->nUsed+p->szSep+1 > p->nAlloc ){ char *zNew; p->nAlloc = p->nAlloc*2 + sz + p->szSep + 1; - zNew = sqlite3_realloc(p->z, p->nAlloc); + /* Using sqlite3_realloc64() would be better, but it is a recent + ** addition and will cause a segfault if loaded by an older version + ** of SQLite. */ + zNew = p->nAlloc<=0x7fffffff ? sqlite3_realloc(p->z, (int)p->nAlloc) : 0; if( zNew==0 ){ sqlite3_free(p->z); memset(p, 0, sizeof(*p)); @@ -93,7 +96,7 @@ static void sqlEvalFunc( sqlite3_result_error_nomem(context); sqlite3_free(x.z); }else{ - sqlite3_result_text(context, x.z, x.nUsed, sqlite3_free); + sqlite3_result_text(context, x.z, (int)x.nUsed, sqlite3_free); } } diff --git a/manifest b/manifest index 042ccce636..375f1f89b0 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sthe\sautoconf\sand\sMSVC\smakefiles,\swhich\shave\sbeen\sbroken\sfor\snearly\sa\nmonth.\s\s:-( -D 2014-12-05T00:17:39.977 +C Fix\scompiler\swarnings. +D 2014-12-05T00:32:09.905 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 6c4f961fa91d0b4fa121946a19f9e5eac2f2f809 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -109,7 +109,7 @@ F ext/icu/sqliteicu.h 728867a802baa5a96de7495e9689a8e01715ef37 F ext/misc/amatch.c 678056a4bfcd83c4e82dea81d37543cd1d6dbee1 F ext/misc/closure.c 636024302cde41b2bf0c542f81c40c624cfb7012 F ext/misc/compress.c 76e45655f4046e756064ab10c62e18f2eb846b9f -F ext/misc/eval.c 04e630bde869aa1fec6b993d40591f963be2f868 +F ext/misc/eval.c f971962e92ebb8b0a4e6b62949463ee454d88fa2 F ext/misc/fileio.c d4171c815d6543a9edef8308aab2951413cd8d0f F ext/misc/fuzzer.c 136533c53cfce0957f0b48fa11dba27e21c5c01d F ext/misc/ieee754.c b0362167289170627659e84173f5d2e8fee8566e @@ -238,7 +238,7 @@ F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d F src/status.c 81712116e826b0089bb221b018929536b2b5406f F src/table.c f142bba7903e93ca8d113a5b8877a108ad1a27dc F src/tclsqlite.c 0a874655dd39a9875e39c5d3c464db662171d228 -F src/test1.c f5d7ecd3dd663b11f35269fd91f7090db0570903 +F src/test1.c c24d7f67252348d756773a6dbe23a61b4552f709 F src/test2.c 98049e51a17dc62606a99a9eb95ee477f9996712 F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df @@ -1223,7 +1223,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 0d3aef97ebddf422b8bdcbc5878970c6129e3f54 -R cd249245e23c4920ae8ada9787d27cef +P 520c2b838da8b230487c8c66f3ba8e5daa1ca886 +R 2f1363efb358b758f4fe53b98d762c1d U drh -Z 911d29bfeef3460d645482250c6ca2bc +Z 8ac94f0b609313b69c75d4df8f71997e diff --git a/manifest.uuid b/manifest.uuid index 3768cb56eb..0fa8785978 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -520c2b838da8b230487c8c66f3ba8e5daa1ca886 \ No newline at end of file +e9955c0e14d13ba1411f013acb4979958dae2516 \ No newline at end of file diff --git a/src/test1.c b/src/test1.c index be4ad92c11..7839b30494 100644 --- a/src/test1.c +++ b/src/test1.c @@ -3661,7 +3661,7 @@ static int test_prepare_v2( zCopy = malloc(bytes); memcpy(zCopy, zSql, bytes); }else{ - int n = strlen(zSql) + 1; + int n = (int)strlen(zSql) + 1; zCopy = malloc(n); memcpy(zCopy, zSql, n); }