OLD | NEW |
1 From 68cc26624a8e4fbbf0d41ac95269739920d11472 Mon Sep 17 00:00:00 2001 | 1 From e007f424af863cda23f578906426d32f06e5c9cb Mon Sep 17 00:00:00 2001 |
2 From: Scott Hess <shess@chromium.org> | 2 From: Scott Hess <shess@chromium.org> |
3 Date: Thu, 12 Feb 2015 15:01:26 -0800 | 3 Date: Thu, 12 Feb 2015 15:01:26 -0800 |
4 Subject: [PATCH 09/10] [fts3] Fix uninit variable in fts3EvalDeferredPhrase. | 4 Subject: [PATCH 08/10] [fts3] Fix uninit variable in fts3EvalDeferredPhrase. |
5 | 5 |
6 Chromium compiles with SQLITE_DISABLE_FTS4_DEFERRED since fts4 is | 6 Chromium compiles with SQLITE_DISABLE_FTS4_DEFERRED since fts4 is |
7 disabled. That compiles away sqlite3Fts3DeferredTokenList() which | 7 disabled. That compiles away sqlite3Fts3DeferredTokenList() which |
8 otherwise initialized pList and nList in fts3EvalDeferredPhrase(). | 8 otherwise initialized pList and nList in fts3EvalDeferredPhrase(). |
9 | 9 |
10 BUG=458266 | 10 BUG=458266 |
11 R=thakis@chromium.org | 11 R=thakis@chromium.org |
12 --- | 12 --- |
13 third_party/sqlite/src/ext/fts3/fts3.c | 4 ++-- | 13 third_party/sqlite/src/ext/fts3/fts3.c | 4 ++-- |
14 1 file changed, 2 insertions(+), 2 deletions(-) | 14 1 file changed, 2 insertions(+), 2 deletions(-) |
15 | 15 |
16 diff --git a/third_party/sqlite/src/ext/fts3/fts3.c b/third_party/sqlite/src/ext
/fts3/fts3.c | 16 diff --git a/third_party/sqlite/src/ext/fts3/fts3.c b/third_party/sqlite/src/ext
/fts3/fts3.c |
17 index 8f15099..a8d16a9 100644 | 17 index 4b032271148e..2a24b78f3783 100644 |
18 --- a/third_party/sqlite/src/ext/fts3/fts3.c | 18 --- a/third_party/sqlite/src/ext/fts3/fts3.c |
19 +++ b/third_party/sqlite/src/ext/fts3/fts3.c | 19 +++ b/third_party/sqlite/src/ext/fts3/fts3.c |
20 @@ -4149,8 +4149,8 @@ static int fts3EvalDeferredPhrase(Fts3Cursor *pCsr, Fts3Ph
rase *pPhrase){ | 20 @@ -4171,8 +4171,8 @@ static int fts3EvalDeferredPhrase(Fts3Cursor *pCsr, Fts3Ph
rase *pPhrase){ |
21 Fts3DeferredToken *pDeferred = pToken->pDeferred; | 21 Fts3DeferredToken *pDeferred = pToken->pDeferred; |
22 | 22 |
23 if( pDeferred ){ | 23 if( pDeferred ){ |
24 - char *pList; | 24 - char *pList; |
25 - int nList; | 25 - int nList; |
26 + char *pList = 0; | 26 + char *pList = 0; |
27 + int nList = 0; | 27 + int nList = 0; |
28 int rc = sqlite3Fts3DeferredTokenList(pDeferred, &pList, &nList); | 28 int rc = sqlite3Fts3DeferredTokenList(pDeferred, &pList, &nList); |
29 if( rc!=SQLITE_OK ) return rc; | 29 if( rc!=SQLITE_OK ) return rc; |
30 | 30 |
31 -- | 31 -- |
32 2.7.0 | 32 2.11.0 |
33 | 33 |
OLD | NEW |