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

Unified Diff: third_party/sqlite/patches/0017-fts3-Fix-uninit-variable-in-fts3EvalDeferredPhrase.patch

Issue 949043002: Add //third_party/sqlite to dirs_to_snapshot, remove net_sql.patch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: 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/0017-fts3-Fix-uninit-variable-in-fts3EvalDeferredPhrase.patch
diff --git a/third_party/sqlite/patches/0017-fts3-Fix-uninit-variable-in-fts3EvalDeferredPhrase.patch b/third_party/sqlite/patches/0017-fts3-Fix-uninit-variable-in-fts3EvalDeferredPhrase.patch
new file mode 100644
index 0000000000000000000000000000000000000000..591377b796386668762c55dcf46936e58b442d74
--- /dev/null
+++ b/third_party/sqlite/patches/0017-fts3-Fix-uninit-variable-in-fts3EvalDeferredPhrase.patch
@@ -0,0 +1,33 @@
+From fb15433301dc736ecee87970314ddad779cb284e Mon Sep 17 00:00:00 2001
+From: Scott Hess <shess@chromium.org>
+Date: Thu, 12 Feb 2015 15:01:26 -0800
+Subject: [PATCH] [fts3] Fix uninit variable in fts3EvalDeferredPhrase.
+
+Chromium compiles with SQLITE_DISABLE_FTS4_DEFERRED since fts4 is
+disabled. That compiles away sqlite3Fts3DeferredTokenList() which
+otherwise initialized pList and nList in fts3EvalDeferredPhrase().
+
+BUG=458266
+R=thakis@chromium.org
+---
+ third_party/sqlite/src/ext/fts3/fts3.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/third_party/sqlite/src/ext/fts3/fts3.c b/third_party/sqlite/src/ext/fts3/fts3.c
+index 3a1152d..c43f369 100644
+--- a/third_party/sqlite/src/ext/fts3/fts3.c
++++ b/third_party/sqlite/src/ext/fts3/fts3.c
+@@ -4038,8 +4038,8 @@ static int fts3EvalDeferredPhrase(Fts3Cursor *pCsr, Fts3Phrase *pPhrase){
+ Fts3DeferredToken *pDeferred = pToken->pDeferred;
+
+ if( pDeferred ){
+- char *pList;
+- int nList;
++ char *pList = 0;
++ int nList = 0;
+ int rc = sqlite3Fts3DeferredTokenList(pDeferred, &pList, &nList);
+ if( rc!=SQLITE_OK ) return rc;
+
+--
+2.2.1
+

Powered by Google App Engine
This is Rietveld 408576698