commit f764dbb50f2bfe95fa993fa670fae926cf36abce
author Nick Kralevich <nnk@google.com> Fri Feb 28 09:46:06 2014 -0800
committer Nick Kralevich <nnk@google.com> Fri Feb 28 18:26:05 2014 +0000
tree 09b136079a37ab548d5b6a9cd1f82783574c3484
parent 2d758ba484351cd86f3f551c3a788255d2e8d9d0

disable fts3_tokenizer

Bug: 13177500
Change-Id: I1581c7ca8ac6d931375fc2cbcbe13f43513ce3c7
(cherry picked from commit a586535b4c1fa23e280ff9a188671113f900b48b)

dist/sqlite3.c

diff --git a/dist/sqlite3.c b/dist/sqlite3.c
index d8bc421..4535f53 100644
--- a/dist/sqlite3.c
+++ b/dist/sqlite3.c
@@ -120222,7 +120222,9 @@
   ** module with sqlite.
   */
   if( SQLITE_OK==rc 
+#ifndef ANDROID    /* fts3_tokenizer disabled for security reasons */
    && 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))