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
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 ff792bb6e293ff303412c25a776d37b54c556369..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) 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
/* See the file NOTICE for conditions of use and distribution. */
/* Functions for maintaining binary balanced trees and some associated
@@
-27,12
+28,13
@@
Returns: nothing
*/
void
*/
void
-tree_add_nonrecipient(uschar *s)
+tree_add_nonrecipient(
const
uschar *s)
{
{
-tree_node *node = store_get(sizeof(tree_node) + Ustrlen(s));
+rmark rpoint = store_mark();
+tree_node * node = store_get(sizeof(tree_node) + Ustrlen(s), s);
Ustrcpy(node->name, s);
node->data.ptr = NULL;
Ustrcpy(node->name, s);
node->data.ptr = NULL;
-if (!tree_insertnode(&tree_nonrecipients, node)) store_reset(
node
);
+if (!tree_insertnode(&tree_nonrecipients, node)) store_reset(
rpoint
);
}
}
@@
-51,12
+53,13
@@
Returns: nothing
*/
void
*/
void
-tree_add_duplicate(uschar *s, address_item *addr)
+tree_add_duplicate(
const
uschar *s, address_item *addr)
{
{
-tree_node *node = store_get(sizeof(tree_node) + Ustrlen(s));
+rmark rpoint = store_mark();
+tree_node * node = store_get(sizeof(tree_node) + Ustrlen(s), s);
Ustrcpy(node->name, s);
node->data.ptr = addr;
Ustrcpy(node->name, s);
node->data.ptr = addr;
-if (!tree_insertnode(&tree_duplicates, node)) store_reset(
node
);
+if (!tree_insertnode(&tree_duplicates, node)) store_reset(
rpoint
);
}
}
@@
-72,16
+75,18
@@
Returns: nothing
*/
void
*/
void
-tree_add_unusable(host_item *h)
+tree_add_unusable(
const
host_item *h)
{
{
+rmark rpoint = store_mark();
tree_node *node;
uschar s[256];
sprintf(CS s, "T:%.200s:%s", h->name, h->address);
tree_node *node;
uschar s[256];
sprintf(CS s, "T:%.200s:%s", h->name, h->address);
-node = store_get(sizeof(tree_node) + Ustrlen(s));
+node = store_get(sizeof(tree_node) + Ustrlen(s),
+ 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;
Ustrcpy(node->name, s);
node->data.val = h->why;
if (h->status == hstatus_unusable_expired) node->data.val += 256;
-if (!tree_insertnode(&tree_unusable, node)) store_reset(
node
);
+if (!tree_insertnode(&tree_unusable, node)) store_reset(
rpoint
);
}
}
@@
-369,7
+374,7
@@
static void
tree_add_var(uschar * name, uschar * val, void * ctx)
{
tree_node ** root = ctx;
tree_add_var(uschar * name, uschar * val, void * ctx)
{
tree_node ** root = ctx;
-tree_node * node = store_get(sizeof(tree_node) + Ustrlen(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);
Ustrcpy(node->name, name);
node->data.ptr = val;
(void) tree_insertnode(root, node);