mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes to the JSON1 extension and to its use by fuzzcheck to avoid problems

Browse Source 
when building DLLs.

FossilOrigin-Name: 01d3ee7bbe4feeb82dcedecbe3c9058c807b18f6
This commit is contained in:
drh 2015-10-14 19:52:27 +00:00
commit 501b402c65
4 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/misc/json1.c
View File

@ -2022,6 +2022,7 @@ int sqlite3Json1Init(sqlite3 *db){
}
#ifndef SQLITE_CORE
#ifdef _WIN32
__declspec(dllexport)
#endif
@ -2034,4 +2035,5 @@ int sqlite3_json_init(
(void)pzErrMsg; /* Unused parameter */
return sqlite3Json1Init(db);
}
#endif
#endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_JSON1) */

18
manifest
View File

@ -1,5 +1,5 @@
C Version\s3.9.0
D 2015-10-14T12:29:53.720
C Fixes\sto\sthe\sJSON1\sextension\sand\sto\sits\suse\sby\sfuzzcheck\sto\savoid\sproblems\nwhen\sbuilding\sDLLs.
D 2015-10-14T19:52:27.982
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in f0088ff0d2ac949fce6de7c00f13a99ac5bdb663
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@ -198,7 +198,7 @@ F ext/misc/eval.c f971962e92ebb8b0a4e6b62949463ee454d88fa2
F ext/misc/fileio.c d4171c815d6543a9edef8308aab2951413cd8d0f
F ext/misc/fuzzer.c 4c84635c71c26cfa7c2e5848cf49fe2d2cfcd767
F ext/misc/ieee754.c b0362167289170627659e84173f5d2e8fee8566e
F ext/misc/json1.c d31022098b0c4c7c2c1781cb328180a4da6fbdb3
F ext/misc/json1.c fed5b948168f26f39e67d898b03d93dd00e75196
F ext/misc/nextchar.c 35c8b8baacb96d92abbb34a83a997b797075b342
F ext/misc/percentile.c bcbee3c061b884eccb80e21651daaae8e1e43c63
F ext/misc/regexp.c af92cdaa5058fcec1451e49becc7ba44dba023dc
@ -753,7 +753,7 @@ F test/fuzz2.test 76dc35b32b6d6f965259508508abce75a6c4d7e1
F test/fuzz3.test 53fabcd5f0f430f8b221282f6c12c4d0903c21eb
F test/fuzz_common.tcl a87dfbb88c2a6b08a38e9a070dabd129e617b45b
F test/fuzz_malloc.test 328f70aaca63adf29b4c6f06505ed0cf57ca7c26
F test/fuzzcheck.c 73d7c49980c1a380f1dff52df9c6d67c854d92ea
F test/fuzzcheck.c c84086021a514360268190a1bc6ae8ed78d7c94f
F test/fuzzdata1.db 7ee3227bad0e7ccdeb08a9e6822916777073c664
F test/fuzzdata2.db f03a420d3b822cc82e4f894ca957618fbe9c4973
F test/fuzzdata3.db c6586d3e3cef0fbc18108f9bb649aa77bfc38aba
@ -1390,10 +1390,8 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
P 47a2ce97d585e1760ffcf760c0de1753677d5713
R 41ced18917e64acb8afddf6eb6ae0b31
T +bgcolor * #d0c0ff
T +sym-release *
T +sym-version-3.9.0 *
P a721fc0d89495518fe5612e2e3bbc60befd2e90d ec003958359d6b69b1b1a75be2a988796268e063
R 143450f83083f2864dd76299804f842d
T +closed ec003958359d6b69b1b1a75be2a988796268e063
U drh
Z b8800b50bce461e41ccef8a16de7b330
Z 9888e39b5177d6b3f8e12974b89fa09f

2
manifest.uuid
View File

@ -1 +1 @@
a721fc0d89495518fe5612e2e3bbc60befd2e90d
01d3ee7bbe4feeb82dcedecbe3c9058c807b18f6

6
test/fuzzcheck.c
View File

@ -1126,12 +1126,6 @@ int main(int argc, char **argv){
}
rc = sqlite3_open_v2("main.db", &db, openFlags, zVfs);
if( rc ) fatalError("cannot open inmem database");
#ifdef SQLITE_ENABLE_JSON1
{
extern int sqlite3_json_init(sqlite3*);
sqlite3_json_init(db);
}
#endif
if( cellSzCkFlag ) runSql(db, "PRAGMA cell_size_check=ON", runFlags);
setAlarm(iTimeout);
#ifndef SQLITE_OMIT_PROGRESS_CALLBACK