summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordumi@chromium.org <dumi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-03 01:40:10 +0000
committerdumi@chromium.org <dumi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-03 01:40:10 +0000
commit8e89fa0e96450c686b6a54051e987ee56fac994f (patch)
treef0878a22f7cd26799fc4e3a5b7d0f4d6e88f54b9
parent593a24bd03f9859617b781674f678095d2055992 (diff)
downloadchromium_src-8e89fa0e96450c686b6a54051e987ee56fac994f.zip
chromium_src-8e89fa0e96450c686b6a54051e987ee56fac994f.tar.gz
chromium_src-8e89fa0e96450c686b6a54051e987ee56fac994f.tar.bz2
Fix a fts3 typo/bug.
TEST=crash doesn't seem to happen anymore BUG=47059 Review URL: http://codereview.chromium.org/2829042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51584 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--third_party/sqlite/ext/fts3/fts3.c2
-rw-r--r--third_party/sqlite/fts3.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/third_party/sqlite/ext/fts3/fts3.c b/third_party/sqlite/ext/fts3/fts3.c
index d118c41..3e87a40 100644
--- a/third_party/sqlite/ext/fts3/fts3.c
+++ b/third_party/sqlite/ext/fts3/fts3.c
@@ -4717,7 +4717,7 @@ static int interiorReaderStep(InteriorReader *pReader){
if( !n ) return SQLITE_CORRUPT_BKPT;
pReader->nData -= n;
pReader->pData += n;
- n += fts3GetVarint32Safe(pReader->pData, &nSuffix, pReader->nData);
+ n = fts3GetVarint32Safe(pReader->pData, &nSuffix, pReader->nData);
if( !n ) return SQLITE_CORRUPT_BKPT;
pReader->nData -= n;
pReader->pData += n;
diff --git a/third_party/sqlite/fts3.patch b/third_party/sqlite/fts3.patch
index 83d2412..622626a 100644
--- a/third_party/sqlite/fts3.patch
+++ b/third_party/sqlite/fts3.patch
@@ -1110,7 +1110,7 @@ Index: ext/fts3/fts3.c
+ if( !n ) return SQLITE_CORRUPT_BKPT;
+ pReader->nData -= n;
+ pReader->pData += n;
-+ n += fts3GetVarint32Safe(pReader->pData, &nSuffix, pReader->nData);
++ n = fts3GetVarint32Safe(pReader->pData, &nSuffix, pReader->nData);
+ if( !n ) return SQLITE_CORRUPT_BKPT;
+ pReader->nData -= n;
+ pReader->pData += n;