blob: 591377b796386668762c55dcf46936e58b442d74 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
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
|
