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

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

Issue 2751253002: [sql] Import SQLite 3.17.0. (Closed)
Patch Set: also clang on Linux i386 Created 3 years, 9 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/0006-fts3-Disable-fts3_tokenizer-and-fts4.patch
diff --git a/third_party/sqlite/patches/0007-fts3-Disable-fts3_tokenizer-and-fts4.patch b/third_party/sqlite/patches/0006-fts3-Disable-fts3_tokenizer-and-fts4.patch
similarity index 84%
rename from third_party/sqlite/patches/0007-fts3-Disable-fts3_tokenizer-and-fts4.patch
rename to third_party/sqlite/patches/0006-fts3-Disable-fts3_tokenizer-and-fts4.patch
index daa24440021e2df95ebcde90a98c7f6f284c40c0..ac27bf170fe454f94d27231d1704e991f9f5d936 100644
--- a/third_party/sqlite/patches/0007-fts3-Disable-fts3_tokenizer-and-fts4.patch
+++ b/third_party/sqlite/patches/0006-fts3-Disable-fts3_tokenizer-and-fts4.patch
@@ -1,7 +1,7 @@
-From 9283044fa483fceefcb077d7b682d570e0d099ee Mon Sep 17 00:00:00 2001
+From 8728c1116d9245f7a0f1e72b5d2f00940a04b104 Mon Sep 17 00:00:00 2001
From: Scott Hess <shess@chromium.org>
Date: Tue, 16 Dec 2014 13:02:27 -0800
-Subject: [PATCH 07/10] [fts3] Disable fts3_tokenizer and fts4.
+Subject: [PATCH 06/10] [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
@@ -14,7 +14,7 @@ No original review URL because this was part of the initial Chromium commit.
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 748faef..4f2ebb8 100644
+index 7c931c42d49e..9659815da93a 100644
--- a/third_party/sqlite/src/ext/fts3/fts3.c
+++ b/third_party/sqlite/src/ext/fts3/fts3.c
@@ -287,6 +287,7 @@
@@ -25,7 +25,7 @@ index 748faef..4f2ebb8 100644
#include "fts3Int.h"
#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
-@@ -3933,7 +3934,11 @@ int sqlite3Fts3Init(sqlite3 *db){
+@@ -3955,7 +3956,11 @@ int sqlite3Fts3Init(sqlite3 *db){
** module with sqlite.
*/
if( SQLITE_OK==rc
@@ -37,7 +37,7 @@ index 748faef..4f2ebb8 100644
&& 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))
-@@ -3943,6 +3948,9 @@ int sqlite3Fts3Init(sqlite3 *db){
+@@ -3965,6 +3970,9 @@ int sqlite3Fts3Init(sqlite3 *db){
rc = sqlite3_create_module_v2(
db, "fts3", &fts3Module, (void *)pHash, hashDestroy
);
@@ -47,7 +47,7 @@ index 748faef..4f2ebb8 100644
if( rc==SQLITE_OK ){
rc = sqlite3_create_module_v2(
db, "fts4", &fts3Module, (void *)pHash, 0
-@@ -3951,6 +3959,7 @@ int sqlite3Fts3Init(sqlite3 *db){
+@@ -3973,6 +3981,7 @@ int sqlite3Fts3Init(sqlite3 *db){
if( rc==SQLITE_OK ){
rc = sqlite3Fts3InitTok(db, (void *)pHash);
}
@@ -56,5 +56,5 @@ index 748faef..4f2ebb8 100644
}
--
-2.7.0
+2.11.0

Powered by Google App Engine
This is Rietveld 408576698