Check query strings of query-style lookups for quoting. Bug 2850

[exim.git] / src / src / tree.c

diff --git a/src/src/tree.c b/src/src/tree.c
index e16a8643c0d60baec0f9e06a4929cabf20db9af0..a4210373836db840480679f486eaac43ee210657 100644 (file)
--- a/src/src/tree.c
+++ b/src/src/tree.c
@@ -3,6 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2015 */
+/* Copyright (c) The Exim Maintainers 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Functions for maintaining binary balanced trees and some associated
@@ -30,7 +31,7 @@ void
 tree_add_nonrecipient(const uschar *s)
 {
 rmark rpoint = store_mark();
-tree_node *node = store_get(sizeof(tree_node) + Ustrlen(s), is_tainted(s));
+tree_node * node = store_get(sizeof(tree_node) + Ustrlen(s), s);
 Ustrcpy(node->name, s);
 node->data.ptr = NULL;
 if (!tree_insertnode(&tree_nonrecipients, node)) store_reset(rpoint);
@@ -55,7 +56,7 @@ void
 tree_add_duplicate(const uschar *s, address_item *addr)
 {
 rmark rpoint = store_mark();
-tree_node *node = store_get(sizeof(tree_node) + Ustrlen(s), is_tainted(s));
+tree_node * node = store_get(sizeof(tree_node) + Ustrlen(s), s);
 Ustrcpy(node->name, s);
 node->data.ptr = addr;
 if (!tree_insertnode(&tree_duplicates, node)) store_reset(rpoint);
@@ -81,7 +82,7 @@ tree_node *node;
 uschar s[256];
 sprintf(CS s, "T:%.200s:%s", h->name, h->address);
 node = store_get(sizeof(tree_node) + Ustrlen(s),
-                       is_tainted(h->name) || is_tainted(h->address));
+           is_tainted(h->name) || is_tainted(h->address) ? GET_TAINTED : GET_UNTAINTED);
 Ustrcpy(node->name, s);
 node->data.val = h->why;
 if (h->status == hstatus_unusable_expired) node->data.val += 256;
@@ -373,7 +374,7 @@ static void
 tree_add_var(uschar * name, uschar * val, void * ctx)
 {
 tree_node ** root = ctx;
-tree_node * node = store_get(sizeof(tree_node) + Ustrlen(name), is_tainted(name));
+tree_node * node = store_get(sizeof(tree_node) + Ustrlen(name), name);
 Ustrcpy(node->name, name);
 node->data.ptr = val;
 (void) tree_insertnode(root, node);