diff options
| author | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2021-04-01 22:45:03 +0200 |
|---|---|---|
| committer | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2021-06-24 21:43:04 +0200 |
| commit | 8fc13e4adcdf5d0cec382c401ce72592569084fe (patch) | |
| tree | ec490c960644d52a0fccfb13b4d670017381459f | |
| parent | f9a3fcddba223133019368e7cd6d51449fc54e7b (diff) | |
| download | exim4-8fc13e4adcdf5d0cec382c401ce72592569084fe.tar.gz | |
search
(cherry picked from commit b71d675f695c2cf17357b190476129535d5f446c)
| -rw-r--r-- | src/src/search.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/src/search.c b/src/src/search.c index 421d9c789..81d1d20f9 100644 --- a/src/src/search.c +++ b/src/src/search.c @@ -392,12 +392,8 @@ lookup_info *lk = lookup_list[search_type]; uschar keybuffer[256]; int old_pool = store_pool; -if (filename && is_tainted(filename)) - { - log_write(0, LOG_MAIN|LOG_PANIC, - "Tainted filename for search: '%s'", filename); +if (filename && is_tainted2(filename, LOG_MAIN|LOG_PANIC, "Tainted filename for search: '%s'", filename)) return NULL; - } /* Change to the search store pool and remember our reset point */ @@ -714,7 +710,7 @@ if (opts) /* 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); |