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
tidying
[exim.git]
/
src
/
src
/
lookups
/
redis.c
diff --git
a/src/src/lookups/redis.c
b/src/src/lookups/redis.c
index 3141aacf6fc7b111d93ef5f22bd7349d7d54a76c..53b479142668ebceec2497cc7726e6c4f6c275f3 100644
(file)
--- a/
src/src/lookups/redis.c
+++ b/
src/src/lookups/redis.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 "../exim.h"
@@
-170,7
+172,7
@@
if (!cn)
}
/* Add the connection to the cache */
}
/* Add the connection to the cache */
- cn = store_get(sizeof(redis_connection),
FALSE
);
+ cn = store_get(sizeof(redis_connection),
GET_UNTAINTED
);
cn->server = server_copy;
cn->handle = redis_handle;
cn->next = redis_connections;
cn->server = server_copy;
cn->handle = redis_handle;
cn->next = redis_connections;
@@
-210,7
+212,7
@@
if(sdata[1])
int siz, ptr, i;
uschar c;
int siz, ptr, i;
uschar c;
-
while (isspace(*s)) s++
;
+
Uskip_whitespace(&s)
;
for (i = 0; *s && i < nele(argv); i++)
{
for (i = 0; *s && i < nele(argv); i++)
{
@@
-222,7
+224,7
@@
if(sdata[1])
argv[i] = string_from_gstring(g);
DEBUG(D_lookup) debug_printf_indent("REDIS: argv[%d] '%s'\n", i, argv[i]);
argv[i] = string_from_gstring(g);
DEBUG(D_lookup) debug_printf_indent("REDIS: argv[%d] '%s'\n", i, argv[i]);
-
while (isspace(*s)) s++
;
+
Uskip_whitespace(&s)
;
}
/* Run the command. We use the argv form rather than plain as that parses
}
/* Run the command. We use the argv form rather than plain as that parses
@@
-398,27
+400,25
@@
whitespace into an argument.
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 *
-redis_quote(uschar *
s, uschar *opt
)
+redis_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) return NULL; /* No options recognized */
if (opt) return NULL; /* No options recognized */
-while ((c = *t++)
!= 0
)
+while ((c = *t++))
if (isspace(c) || c == '\\') count++;
if (isspace(c) || c == '\\') 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 (isspace(c) || c == '\\') *t++ = '\\';
*t++ = c;
{
if (isspace(c) || c == '\\') *t++ = '\\';
*t++ = c;
@@
-434,14
+434,16
@@
return quoted;
*************************************************/
#include "../version.h"
*************************************************/
#include "../version.h"
-void
-redis_version_report(
FILE *f
)
+gstring *
+redis_version_report(
gstring * g
)
{
{
-
fprintf(f, "Library version: REDIS: Compile: %d [%d]\n"
,
-
HIREDIS_MAJOR, HIREDIS_MINOR);
+
g = string_fmt_append(g
,
+
"Library version: REDIS: Compile: %d [%d]\n",
HIREDIS_MAJOR, HIREDIS_MINOR);
#ifdef DYNLOOKUP
#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;
}
}