Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1809)

Unified Diff: third_party/sqlite/patches/0010-fts3-Disable-fts3_tokenizer-and-fts4.patch

Issue 901033002: Import SQLite 3.8.7.4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Chromium changes to support SQLite 3.8.7.4. Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/sqlite/patches/0010-fts3-Disable-fts3_tokenizer-and-fts4.patch
diff --git a/third_party/sqlite/patches/0010-fts3-Disable-fts3_tokenizer-and-fts4.patch b/third_party/sqlite/patches/0010-fts3-Disable-fts3_tokenizer-and-fts4.patch
deleted file mode 100644
index 3fa78ddefaf683a7a77e6fb1e701b742cf79bbc9..0000000000000000000000000000000000000000
--- a/third_party/sqlite/patches/0010-fts3-Disable-fts3_tokenizer-and-fts4.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From b11ecfada70198bc5b6dc8419d2b7b3c7f6542b8 Mon Sep 17 00:00:00 2001
-From: Scott Hess <shess@chromium.org>
-Date: Tue, 16 Dec 2014 13:02:27 -0800
-Subject: [PATCH 10/23] [fts3] Disable fts3_tokenizer and fts4.
-
-fts3_tokenizer allows a SQLite user to specify a pointer to call as a
-function, which has obvious sercurity implications. Disable fts4 until
-someone explicitly decides to own support for it.
-
-No original review URL because this was part of the initial Chromium commit.
----
- third_party/sqlite/src/ext/fts3/fts3.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/third_party/sqlite/src/ext/fts3/fts3.c b/third_party/sqlite/src/ext/fts3/fts3.c
-index 20da051..7accb11 100644
---- a/third_party/sqlite/src/ext/fts3/fts3.c
-+++ b/third_party/sqlite/src/ext/fts3/fts3.c
-@@ -291,6 +291,7 @@
- ** deletions and duplications. This would basically be a forced merge
- ** into a single segment.
- */
-+#define CHROMIUM_FTS3_CHANGES 1
-
- #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
-
-@@ -3646,7 +3647,11 @@ int sqlite3Fts3Init(sqlite3 *db){
- ** module with sqlite.
- */
- if( SQLITE_OK==rc
-+#if CHROMIUM_FTS3_CHANGES && !SQLITE_TEST
-+ /* fts3_tokenizer() disabled for security reasons. */
-+#else
- && SQLITE_OK==(rc = sqlite3Fts3InitHashTable(db, pHash, "fts3_tokenizer"))
-+#endif
- && SQLITE_OK==(rc = sqlite3_overload_function(db, "snippet", -1))
- && SQLITE_OK==(rc = sqlite3_overload_function(db, "offsets", 1))
- && SQLITE_OK==(rc = sqlite3_overload_function(db, "matchinfo", 1))
-@@ -3656,11 +3661,15 @@ int sqlite3Fts3Init(sqlite3 *db){
- rc = sqlite3_create_module_v2(
- db, "fts3", &fts3Module, (void *)pHash, hashDestroy
- );
-+#if CHROMIUM_FTS3_CHANGES && !SQLITE_TEST
-+ /* Disable fts4 pending review. */
-+#else
- if( rc==SQLITE_OK ){
- rc = sqlite3_create_module_v2(
- db, "fts4", &fts3Module, (void *)pHash, 0
- );
- }
-+#endif
- return rc;
- }
-
---
-2.2.1
-

Powered by Google App Engine
This is Rietveld 408576698