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

Side by Side Diff: third_party/sqlite/patches/0009-fts3-Fix-uninit-variable-in-fts3EvalDeferredPhrase.patch

Issue 2751253002: [sql] Import SQLite 3.17.0. (Closed)
Patch Set: also clang on Linux i386 Created 3 years, 9 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 unified diff | Download patch
OLDNEW
(Empty)
1 From 68cc26624a8e4fbbf0d41ac95269739920d11472 Mon Sep 17 00:00:00 2001
2 From: Scott Hess <shess@chromium.org>
3 Date: Thu, 12 Feb 2015 15:01:26 -0800
4 Subject: [PATCH 09/10] [fts3] Fix uninit variable in fts3EvalDeferredPhrase.
5
6 Chromium compiles with SQLITE_DISABLE_FTS4_DEFERRED since fts4 is
7 disabled. That compiles away sqlite3Fts3DeferredTokenList() which
8 otherwise initialized pList and nList in fts3EvalDeferredPhrase().
9
10 BUG=458266
11 R=thakis@chromium.org
12 ---
13 third_party/sqlite/src/ext/fts3/fts3.c | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)
15
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
18 --- a/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){
21 Fts3DeferredToken *pDeferred = pToken->pDeferred;
22
23 if( pDeferred ){
24 - char *pList;
25 - int nList;
26 + char *pList = 0;
27 + int nList = 0;
28 int rc = sqlite3Fts3DeferredTokenList(pDeferred, &pList, &nList);
29 if( rc!=SQLITE_OK ) return rc;
30
31 --
32 2.7.0
33
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698