commit 82be6d546803fdf116c4d2b9e534559e32598288
author Nick Kralevich <nnk@google.com> Mon Mar 03 21:18:25 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Mar 03 21:18:25 2014 +0000
tree 1455b0a3544ed3f1dc751fb62aebcb3005976a7a
parent ac0e0d5f866fbce0ebf00d0ddd615464849aa83b
parent 6ecc6e17f3da9f6307a9f0077ef9b66a02b84e9a

am 6ecc6e17: am e6db643f: am f6d9fa68: am 20f7eeb8: am 9ff7db77: am f764dbb5: disable fts3_tokenizer

* commit '6ecc6e17f3da9f6307a9f0077ef9b66a02b84e9a':
  disable fts3_tokenizer

dist/sqlite3.c

diff --git a/dist/sqlite3.c b/dist/sqlite3.c
index c6c8a5e..8165c95 100644
--- a/dist/sqlite3.c
+++ b/dist/sqlite3.c
@@ -120232,7 +120232,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))