From ada3f2b14f1f9e9625f8e8f0e6b5a367bc0c9773 Mon Sep 17 00:00:00 2001 From: drh Date: Mon, 23 Mar 2015 21:32:50 +0000 Subject: [PATCH] Disable loadable extensions in the command-line shell on VxWorks user-space. FossilOrigin-Name: 0ee2d38deb35aefc55395e86984a9a773caf6218 --- manifest | 13 ++++++------- manifest.uuid | 2 +- src/shell.c | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/manifest b/manifest index 53a9cfe78a..9bc4020219 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Track\stotal\smemory\susage\susing\sa\s64-bit\sinteger\son\s64-bit\ssystems.\s\sAdd\nthe\ssqlite3_status64()\sinterface.\s\sMake\sthe\ssqlite3_status()\sand\nsqlite3_status64()\sinterfaces\satomic\susing\smutexes\sand\sverify\scorrect\nmutex\soperation\susing\sassert()\sstatements. -D 2015-03-23T19:55:21.641 +C Disable\sloadable\sextensions\sin\sthe\scommand-line\sshell\son\sVxWorks\suser-space. +D 2015-03-23T21:32:50.879 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 88a3e6261286db378fdffa1124cad11b3c05f5bb F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -231,7 +231,7 @@ F src/random.c ba2679f80ec82c4190062d756f22d0c358180696 F src/resolve.c f4d79e31ffa5820c2e3d1740baa5e9b190425f2b F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e F src/select.c 72ffb62e2879956302140e9f6e6ae88aee36b0e5 -F src/shell.c 9c1589c8271c04c02d23cdbc2c07bb40752fa9eb +F src/shell.c 3ae1e53878d2804fe77b8c8f1f6ca287a0e5d80e F src/sqlite.h.in df180ecc3215e4b87dbd536507869511bec88841 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d @@ -1246,8 +1246,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 ff4812d0e8e6322ca8b6992925fd4ef4aee463e6 3de085eab2fbe491f2242b340851e8af8f61ad13 -R fa228592c968c6dd60a3ff76053c22f4 -T +closed 3de085eab2fbe491f2242b340851e8af8f61ad13 +P 6fc4e79a2350295a15ac464593ad39d904953041 +R f88d42f63f5075e0fafdf77b9c8623bb U drh -Z 5ddc58556d6343081a340eb577f95e29 +Z b5778fea5ecdfe311fd40aa2979f5026 diff --git a/manifest.uuid b/manifest.uuid index dc77af1006..4f62d697cb 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -6fc4e79a2350295a15ac464593ad39d904953041 \ No newline at end of file +0ee2d38deb35aefc55395e86984a9a773caf6218 \ No newline at end of file diff --git a/src/shell.c b/src/shell.c index d5a8a3fe95..b31ea16333 100644 --- a/src/shell.c +++ b/src/shell.c @@ -27,7 +27,7 @@ /* ** No support for loadable extensions in VxWorks. */ -#if defined(_WRS_KERNEL) && !SQLITE_OMIT_LOAD_EXTENSION +#if (defined(__RTP__) || defined(_WRS_KERNEL)) && !SQLITE_OMIT_LOAD_EXTENSION # define SQLITE_OMIT_LOAD_EXTENSION 1 #endif