|
 |
7d97b9 |
Subject: [PATCH] Fix a null pointer deference that can occur on a strange
|
|
|
7d97b9 |
matchinfo() query.
|
|
|
7d97b9 |
|
|
|
7d97b9 |
---
|
|
|
7d97b9 |
ext/fts3/fts3_snippet.c | 2 +-
|
|
|
7d97b9 |
test/fts3matchinfo2.test | 35 +++++++++++++++++++++++++++++++++++
|
|
|
7d97b9 |
2 files changed, 36 insertions(+), 1 deletion(-)
|
|
|
7d97b9 |
create mode 100644 test/fts3matchinfo2.test
|
|
|
7d97b9 |
|
|
|
7d97b9 |
diff --git a/ext/fts3/fts3_snippet.c b/ext/fts3/fts3_snippet.c
|
|
|
7d97b9 |
index a0771c0..5778620 100644
|
|
|
7d97b9 |
--- a/ext/fts3/fts3_snippet.c
|
|
|
7d97b9 |
+++ b/ext/fts3/fts3_snippet.c
|
|
|
7d97b9 |
@@ -869,7 +869,7 @@ static void fts3ExprLHits(
|
|
|
7d97b9 |
iStart = pExpr->iPhrase * ((p->nCol + 31) / 32);
|
|
|
7d97b9 |
}
|
|
|
7d97b9 |
|
|
|
7d97b9 |
- while( 1 ){
|
|
|
7d97b9 |
+ if( pIter ) while( 1 ){
|
|
|
7d97b9 |
int nHit = fts3ColumnlistCount(&pIter);
|
|
|
7d97b9 |
if( (pPhrase->iColumn>=pTab->nColumn || pPhrase->iColumn==iCol) ){
|
|
|
7d97b9 |
if( p->flag==FTS3_MATCHINFO_LHITS ){
|
|
|
7d97b9 |
diff --git a/test/fts3matchinfo2.test b/test/fts3matchinfo2.test
|
|
|
7d97b9 |
new file mode 100644
|
|
|
7d97b9 |
index 0000000..d6b3ad0
|
|
|
7d97b9 |
--- /dev/null
|
|
|
7d97b9 |
+++ b/test/fts3matchinfo2.test
|
|
|
7d97b9 |
@@ -0,0 +1,35 @@
|
|
|
7d97b9 |
+# 2020-05-14
|
|
|
7d97b9 |
+#
|
|
|
7d97b9 |
+# The author disclaims copyright to this source code. In place of
|
|
|
7d97b9 |
+# a legal notice, here is a blessing:
|
|
|
7d97b9 |
+#
|
|
|
7d97b9 |
+# May you do good and not evil.
|
|
|
7d97b9 |
+# May you find forgiveness for yourself and forgive others.
|
|
|
7d97b9 |
+# May you share freely, never taking more than you give.
|
|
|
7d97b9 |
+#
|
|
|
7d97b9 |
+#***********************************************************************
|
|
|
7d97b9 |
+# This file implements regression tests for the FTS3 module. The focus
|
|
|
7d97b9 |
+# of this file is tables created with the "matchinfo=fts3" option.
|
|
|
7d97b9 |
+#
|
|
|
7d97b9 |
+
|
|
|
7d97b9 |
+set testdir [file dirname $argv0]
|
|
|
7d97b9 |
+source $testdir/tester.tcl
|
|
|
7d97b9 |
+
|
|
|
7d97b9 |
+# If SQLITE_ENABLE_FTS3 is not defined, omit this file.
|
|
|
7d97b9 |
+ifcapable !fts3 { finish_test ; return }
|
|
|
7d97b9 |
+
|
|
|
7d97b9 |
+set sqlite_fts3_enable_parentheses 1
|
|
|
7d97b9 |
+
|
|
|
7d97b9 |
+# Crash case found by cyg0810 at gmail.com 2020-05-14. Reported to
|
|
|
7d97b9 |
+# chromium (which is not vulnerable) who kindly referred it to us.
|
|
|
7d97b9 |
+#
|
|
|
7d97b9 |
+do_execsql_test 1.0 {
|
|
|
7d97b9 |
+ CREATE TABLE t_content(col0 INTEGER);
|
|
|
7d97b9 |
+ CREATE VIRTUAL TABLE t0 USING fts3(col0 INTEGER PRIMARY KEY,col1 VARCHAR(8),col2 BINARY,col3 BINARY);
|
|
|
7d97b9 |
+ INSERT INTO t0 VALUES (1, '1234','aaaa','bbbb');
|
|
|
7d97b9 |
+ SELECT hex(matchinfo(t0,'yxy')) FROM t0 WHERE t0 MATCH x'2b0a312b0a312a312a2a0b5d0a0b0b0a312a0a0b0b0a312a0b310a392a0b0a27312a2a0b5d0a312a0b310a31315d0b310a312a316d2a0b313b15bceaa50a312a0b0a27312a2a0b5d0a312a0b310a312b0b2a310a312a0b2a0b2a0b2e5d0a0bff313336e34a2a312a0b0a3c310b0a0b4b4b0b4b2a4bec40322b2a0b310a0a312a0a0a0a0a0a0a0a0a0b310a312a2a2a0b5d0a0b0b0a312a0b310a312a0b0a4e4541530b310a5df5ced70a0a0a0a0a4f520a0a0a0a0a0a0a312a0b0a4e4541520b310a5d616161610a0a0a0a4f520a0a0a0a0a0a312b0a312a312a0a0a0a0a0a0a004a0b0a310b220a0b0a310a4a22310a0b0a7e6fe0e0e030e0e0e0e0e01176e02000e0e0e0e0e01131320226310a0b0a310a4a22310a0b0a310a766f8b8b4ee0e0300ae0090909090909090909090909090909090909090909090909090909090909090947aaaa540b09090909090909090909090909090909090909090909090909090909090909fae0e0f2f22164e0e0f273e07fefefef7d6dfafafafa6d6d6d6d';
|
|
|
7d97b9 |
+} {/000000.*0000000/}
|
|
|
7d97b9 |
+
|
|
|
7d97b9 |
+
|
|
|
7d97b9 |
+set sqlite_fts3_enable_parentheses 0
|
|
|
7d97b9 |
+finish_test
|
|
|
7d97b9 |
\ No newline at end of file
|
|
|
7d97b9 |
--
|
|
|
7d97b9 |
2.24.1
|
|
|
7d97b9 |
|