From: Jeremy Harris Date: Mon, 12 Aug 2024 08:32:32 +0000 (+0100) Subject: Mem-management: use proper define for constant X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/6eba077859ac4379db646278d5c6b96f444f1190?hp=-c Mem-management: use proper define for constant --- 6eba077859ac4379db646278d5c6b96f444f1190 diff --git a/src/src/drtables.c b/src/src/drtables.c index fff3af82f..424c6197c 100644 --- a/src/src/drtables.c +++ b/src/src/drtables.c @@ -563,7 +563,8 @@ static struct lookupmodulestr *lookupmodules = NULL; static void addlookupmodule(void *dl, struct lookup_module_info *info) { -struct lookupmodulestr *p = store_get(sizeof(struct lookupmodulestr), GET_UNTAINTED); +struct lookupmodulestr * p = + store_get(sizeof(struct lookupmodulestr), GET_UNTAINTED); p->dl = dl; p->info = info; diff --git a/src/src/host.c b/src/src/host.c index 182e5068b..742cfec48 100644 --- a/src/src/host.c +++ b/src/src/host.c @@ -737,7 +737,7 @@ add_unique_interface(ip_address_item *list, ip_address_item *ipa) ip_address_item *ipa2; for (ipa2 = list; ipa2; ipa2 = ipa2->next) if (Ustrcmp(ipa2->address, ipa->address) == 0) return list; -ipa2 = store_get_perm(sizeof(ip_address_item), FALSE); +ipa2 = store_get_perm(sizeof(ip_address_item), GET_UNTAINTED); *ipa2 = *ipa; ipa2->next = list; return ipa2; diff --git a/src/src/readconf.c b/src/src/readconf.c index b7df7be25..231d3feb6 100644 --- a/src/src/readconf.c +++ b/src/src/readconf.c @@ -3078,7 +3078,7 @@ read_named_list(tree_node **anchorp, int *numberp, int max, uschar *s, BOOL forcecache = FALSE; uschar *ss; tree_node *t; -namedlist_block * nb = store_get_perm(sizeof(namedlist_block), FALSE); +namedlist_block * nb = store_get_perm(sizeof(namedlist_block), GET_UNTAINTED); if (Ustrncmp(s, "_cache", 6) == 0) { @@ -3724,7 +3724,7 @@ for (driver_info * dd = drivers_available; dd->driver_name[0] != 0; { int len = dd->options_len; d->info = dd; - d->options_block = store_get_perm(len, FALSE); + d->options_block = store_get_perm(len, GET_UNTAINTED); memcpy(d->options_block, dd->options_block, len); for (int i = 0; i < *(dd->options_count); i++) dd->options[i].type &= ~opt_set; @@ -3841,7 +3841,7 @@ while ((buffer = get_config_line())) /* Set up a new driver instance data block on the chain, with its default values installed. */ - d = store_get_perm(instance_size, FALSE); + d = store_get_perm(instance_size, GET_UNTAINTED); memcpy(d, instance_default, instance_size); *p = d; p = (driver_instance **)&d->next; diff --git a/src/src/spool_in.c b/src/src/spool_in.c index c788fd8f8..4ee1455d0 100644 --- a/src/src/spool_in.c +++ b/src/src/spool_in.c @@ -323,7 +323,7 @@ while ((len = Ustrlen(big_buffer)) == big_buffer_size-1 if (big_buffer_size >= BIG_BUFFER_SIZE * 4) return NULL; newsize = big_buffer_size * 2; - newbuffer = store_get_perm(newsize, FALSE); + newbuffer = store_get_perm(newsize, GET_UNTAINTED); memcpy(newbuffer, big_buffer, len); big_buffer = newbuffer;