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
/
pgsql.c
diff --git
a/src/src/lookups/pgsql.c
b/src/src/lookups/pgsql.c
index 2f0372ac2b6c787058242d461bc12f0a19abcdd7..1583378d548eb9ca0f6ebb1e342bb9921f0ea303 100644
(file)
--- a/
src/src/lookups/pgsql.c
+++ b/
src/src/lookups/pgsql.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 */
/* Thanks to Petr Cech for contributing the original code for these
functions. Thanks to Joachim Wieland for the initial patch for the Unix domain
/* Thanks to Petr Cech for contributing the original code for these
functions. Thanks to Joachim Wieland for the initial patch for the Unix domain
@@
-261,7
+263,7
@@
if (!cn)
/* Add the connection to the cache */
/* Add the connection to the cache */
- cn = store_get(sizeof(pgsql_connection),
FALSE
);
+ cn = store_get(sizeof(pgsql_connection),
GET_UNTAINTED
);
cn->server = server_copy;
cn->handle = pg_conn;
cn->next = pgsql_connections;
cn->server = server_copy;
cn->handle = pg_conn;
cn->next = pgsql_connections;
@@
-335,6
+337,7
@@
for (int i = 0; i < num_tuples; i++)
uschar *tmp = US PQgetvalue(pg_result, i, j);
result = lf_quote(US PQfname(pg_result, j), tmp, Ustrlen(tmp), result);
}
uschar *tmp = US PQgetvalue(pg_result, i, j);
result = lf_quote(US PQfname(pg_result, j), tmp, Ustrlen(tmp), result);
}
+ if (!result) result = string_get(1);
}
/* If result is NULL then no data has been found and so we return FAIL. */
}
/* If result is NULL then no data has been found and so we return FAIL. */
@@
-412,27
+415,25
@@
Why, I don't know. Seems odd for just string escaping...]
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 *
-pgsql_quote(uschar *
s, uschar *opt
)
+pgsql_quote(uschar *
s, uschar * opt, unsigned idx
)
{
{
-register int c;
-int count = 0;
-uschar *t = s;
-uschar *quoted;
+int count = 0, c;
+uschar * t = s, * quoted;
-if (opt
!= NULL
) return NULL; /* No options recognized */
+if (opt) return NULL; /* No options recognized */
-while ((c = *t++)
!= 0
)
+while ((c = *t++))
if (Ustrchr("\n\t\r\b\'\"\\", c) != NULL) count++;
if (Ustrchr("\n\t\r\b\'\"\\", c) != NULL) count++;
-if (count == 0) return s;
-t = quoted = store_get(Ustrlen(s) + count + 1, is_tainted(s));
+t = quoted = store_get_quoted(Ustrlen(s) + count + 1, s, idx);
-while ((c = *s++)
!= 0
)
+while ((c = *s++))
{
if (c == '\'')
{
{
if (c == '\'')
{
@@
-444,16
+445,11
@@
while ((c = *s++) != 0)
*t++ = '\\';
switch(c)
{
*t++ = '\\';
switch(c)
{
- case '\n': *t++ = 'n';
- break;
- case '\t': *t++ = 't';
- break;
- case '\r': *t++ = 'r';
- break;
- case '\b': *t++ = 'b';
- break;
- default: *t++ = c;
- break;
+ case '\n': *t++ = 'n'; break;
+ case '\t': *t++ = 't'; break;
+ case '\r': *t++ = 'r'; break;
+ case '\b': *t++ = 'b'; break;
+ default: *t++ = c; break;
}
}
else *t++ = c;
}
}
else *t++ = c;
@@
-472,11
+468,11
@@
return quoted;
#include "../version.h"
#include "../version.h"
-void
-pgsql_version_report(
FILE *f
)
+gstring *
+pgsql_version_report(
gstring * g
)
{
#ifdef DYNLOOKUP
{
#ifdef DYNLOOKUP
-
fprintf(f
, "Library version: PostgreSQL: Exim version %s\n", EXIM_VERSION_STR);
+
g = string_fmt_append(g
, "Library version: PostgreSQL: Exim version %s\n", EXIM_VERSION_STR);
#endif
/* Version reporting: there appears to be no available information about
#endif
/* Version reporting: there appears to be no available information about
@@
-484,6
+480,8
@@
the client library in libpq-fe.h; once you have a connection object, you
can access the server version and the chosen protocol version, but those
aren't really what we want. It might make sense to debug_printf those
when the connection is established though? */
can access the server version and the chosen protocol version, but those
aren't really what we want. It might make sense to debug_printf those
when the connection is established though? */
+
+return g;
}
}