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
Revert introduction of alloc_insecure_tainted_data
[exim.git]
/
src
/
src
/
search.c
diff --git
a/src/src/search.c
b/src/src/search.c
index 63a1f91de81f9d2c629f95deb5db9d814fb6c2d3..d93397f096a32cde7f71330600d2f75008aaf604 100644
(file)
--- a/
src/src/search.c
+++ b/
src/src/search.c
@@
-390,8
+390,12
@@
lookup_info *lk = lookup_list[search_type];
uschar keybuffer[256];
int old_pool = store_pool;
uschar keybuffer[256];
int old_pool = store_pool;
-if (filename && is_tainted2(filename, LOG_MAIN|LOG_PANIC, "Tainted filename for search: '%s'", filename))
+if (filename && is_tainted(filename))
+ {
+ log_write(0, LOG_MAIN|LOG_PANIC,
+ "Tainted filename for search: '%s'", filename);
return NULL;
return NULL;
+ }
/* Change to the search store pool and remember our reset point */
/* Change to the search store pool and remember our reset point */
@@
-708,7
+712,7
@@
if (opts)
/* Arrange to put this database at the top of the LRU chain if it is a type
that opens real files. */
/* Arrange to put this database at the top of the LRU chain if it is a type
that opens real files. */
-if ( open_top != (tree_node *)handle
+if ( open_top != (tree_node *)handle
&& lookup_list[t->name[0]-'0']->type == lookup_absfile)
{
search_cache *c = (search_cache *)(t->data.ptr);
&& lookup_list[t->name[0]-'0']->type == lookup_absfile)
{
search_cache *c = (search_cache *)(t->data.ptr);