summaryrefslogtreecommitdiffstats
path: root/ext/fts5/fts5_expr.c
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-19 04:07:40 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-19 04:07:40 +0000
commit9d2c15192c890a8876bcb9a2ef918756d03718b6 (patch)
tree8340f6a53cda0ba296d162c8c8d767086a337ff9 /ext/fts5/fts5_expr.c
parentAdding upstream version 3.46.0. (diff)
downloadsqlite3-9d2c15192c890a8876bcb9a2ef918756d03718b6.tar.xz
sqlite3-9d2c15192c890a8876bcb9a2ef918756d03718b6.zip
Adding upstream version 3.46.1.upstream/3.46.1upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'ext/fts5/fts5_expr.c')
-rw-r--r--ext/fts5/fts5_expr.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/ext/fts5/fts5_expr.c b/ext/fts5/fts5_expr.c
index 05c1b59..960a4d4 100644
--- a/ext/fts5/fts5_expr.c
+++ b/ext/fts5/fts5_expr.c
@@ -324,7 +324,11 @@ int sqlite3Fts5ExprNew(
}
sqlite3_free(sParse.apPhrase);
- *pzErr = sParse.zErr;
+ if( 0==*pzErr ){
+ *pzErr = sParse.zErr;
+ }else{
+ sqlite3_free(sParse.zErr);
+ }
return sParse.rc;
}
@@ -2452,6 +2456,7 @@ Fts5ExprNode *sqlite3Fts5ParseImplicitAnd(
assert( pRight->eType==FTS5_STRING
|| pRight->eType==FTS5_TERM
|| pRight->eType==FTS5_EOF
+ || (pRight->eType==FTS5_AND && pParse->bPhraseToAnd)
);
if( pLeft->eType==FTS5_AND ){