git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SPDX: Mass-update to GPL-2.0-or-later
[exim.git]
/
src
/
src
/
lookups
/
sqlite.c
diff --git
a/src/src/lookups/sqlite.c
b/src/src/lookups/sqlite.c
index cccaa1b72da5022d1d4231b252e65cf631a3eaf3..6c7af4225eac0bd71c0209dc438ee2140166fd5c 100644
(file)
--- a/
src/src/lookups/sqlite.c
+++ b/
src/src/lookups/sqlite.c
@@
-2,8
+2,10
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
/* See the file NOTICE for conditions of use and distribution. */
/* Copyright (c) University of Cambridge 1995 - 2018 */
/* See the file NOTICE for conditions of use and distribution. */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
#include "../exim.h"
#include "lf_functions.h"
#include "../exim.h"
#include "lf_functions.h"
@@
-23,16
+25,23
@@
sqlite_open(const uschar * filename, uschar ** errmsg)
sqlite3 *db = NULL;
int ret;
sqlite3 *db = NULL;
int ret;
-if (!filename || !*filename) filename = sqlite_dbfile;
-if (*filename != '/')
+if (!filename || !*filename)
+ {
+ DEBUG(D_lookup) debug_printf_indent("Using sqlite_dbfile: %s\n", sqlite_dbfile);
+ filename = sqlite_dbfile;
+ }
+if (!filename || *filename != '/')
*errmsg = US"absolute file name expected for \"sqlite\" lookup";
else if ((ret = sqlite3_open(CCS filename, &db)) != 0)
{
*errmsg = (void *)sqlite3_errmsg(db);
*errmsg = US"absolute file name expected for \"sqlite\" lookup";
else if ((ret = sqlite3_open(CCS filename, &db)) != 0)
{
*errmsg = (void *)sqlite3_errmsg(db);
+ sqlite3_close(db);
+ db = NULL;
DEBUG(D_lookup) debug_printf_indent("Error opening database: %s\n", *errmsg);
}
DEBUG(D_lookup) debug_printf_indent("Error opening database: %s\n", *errmsg);
}
-sqlite3_busy_timeout(db, 1000 * sqlite_lock_timeout);
+if (db)
+ sqlite3_busy_timeout(db, 1000 * sqlite_lock_timeout);
return db;
}
return db;
}
@@
-58,7
+67,7
@@
if (argc > 1)
/* For multiple fields, include the field name too */
for (int i = 0; i < argc; i++)
{
/* For multiple fields, include the field name too */
for (int i = 0; i < argc; i++)
{
- uschar *
value = US((argv[i] != NULL)? argv[i]:
"<NULL>");
+ uschar *
value = US(argv[i] ? argv[i] :
"<NULL>");
res = lf_quote(US azColName[i], value, Ustrlen(value), res);
}
}
res = lf_quote(US azColName[i], value, Ustrlen(value), res);
}
}
@@
-66,7
+75,8
@@
if (argc > 1)
else
res = string_cat(res, argv[0] ? US argv[0] : US "<NULL>");
else
res = string_cat(res, argv[0] ? US argv[0] : US "<NULL>");
-*(gstring **)arg = res;
+/* always return a non-null gstring, even for a zero-length string result */
+*(gstring **)arg = res ? res : string_get(1);
return 0;
}
return 0;
}
@@
-86,7
+96,7
@@
if (ret != SQLITE_OK)
return FAIL;
}
return FAIL;
}
-if (!res) *do_cache = 0;
+if (!res) *do_cache = 0;
/* on fail, wipe cache */
*result = string_from_gstring(res);
return OK;
*result = string_from_gstring(res);
return OK;
@@
-117,26
+127,25
@@
for sqlite is the single quote, and it is quoted by doubling.
Arguments:
s the string to be quoted
opt additional option text or NULL if none
Arguments:
s the string to be quoted
opt additional option text or NULL if none
+ idx lookup type index
Returns: the processed string or NULL for a bad option
*/
static uschar *
Returns: the processed string or NULL for a bad option
*/
static uschar *
-sqlite_quote(uschar *
s, uschar *opt
)
+sqlite_quote(uschar *
s, uschar * opt, unsigned idx
)
{
{
-register int c;
-int count = 0;
-uschar *t = s;
-uschar *quoted;
+int c, count = 0;
+uschar * t = s, * quoted;
-if (opt
!= NULL
) return NULL; /* No options recognized */
+if (opt) return NULL; /* No options recognized */
-while ((c = *t++) != 0) if (c == '\'') count++;
+while ((c = *t++)) if (c == '\'') count++;
+count += t - s;
-if (count == 0) return s;
-t = quoted = store_get(Ustrlen(s) + count + 1, is_tainted(s));
+t = quoted = store_get_quoted(count + 1, s, idx);
-while ((c = *s++)
!= 0
)
+while ((c = *s++))
{
if (c == '\'') *t++ = '\'';
*t++ = c;
{
if (c == '\'') *t++ = '\'';
*t++ = c;
@@
-156,15
+165,18
@@
return quoted;
#include "../version.h"
#include "../version.h"
-void
-sqlite_version_report(
FILE *f
)
+gstring *
+sqlite_version_report(
gstring * g
)
{
{
-fprintf(f, "Library version: SQLite: Compile: %s\n"
- " Runtime: %s\n",
+g = string_fmt_append(g,
+ "Library version: SQLite: Compile: %s\n"
+ " Runtime: %s\n",
SQLITE_VERSION, sqlite3_libversion());
#ifdef DYNLOOKUP
SQLITE_VERSION, sqlite3_libversion());
#ifdef DYNLOOKUP
-fprintf(f, " Exim version %s\n", EXIM_VERSION_STR);
+g = string_fmt_append(g,
+ " Exim version %s\n", EXIM_VERSION_STR);
#endif
#endif
+return g;
}
static lookup_info _lookup_info = {
}
static lookup_info _lookup_info = {