summaryrefslogtreecommitdiff
path: root/chromium/third_party/sqlite/patched/ext/fts5/fts5_expr.c
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/sqlite/patched/ext/fts5/fts5_expr.c')
-rw-r--r--chromium/third_party/sqlite/patched/ext/fts5/fts5_expr.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/chromium/third_party/sqlite/patched/ext/fts5/fts5_expr.c b/chromium/third_party/sqlite/patched/ext/fts5/fts5_expr.c
index 822fb63de0b..6c2de9941e1 100644
--- a/chromium/third_party/sqlite/patched/ext/fts5/fts5_expr.c
+++ b/chromium/third_party/sqlite/patched/ext/fts5/fts5_expr.c
@@ -2516,10 +2516,12 @@ static void fts5ExprFunction(
azConfig[1] = "main";
azConfig[2] = "tbl";
for(i=3; iArg<nArg; iArg++){
- azConfig[i++] = (const char*)sqlite3_value_text(apVal[iArg]);
+ const char *z = (const char*)sqlite3_value_text(apVal[iArg]);
+ azConfig[i++] = (z ? z : "");
}
zExpr = (const char*)sqlite3_value_text(apVal[0]);
+ if( zExpr==0 ) zExpr = "";
rc = sqlite3Fts5ConfigParse(pGlobal, db, nConfig, azConfig, &pConfig, &zErr);
if( rc==SQLITE_OK ){