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
pipe
[exim.git]
/
src
/
src
/
routers
/
rf_get_munge_headers.c
diff --git
a/src/src/routers/rf_get_munge_headers.c
b/src/src/routers/rf_get_munge_headers.c
index 745704f6241ddb112a4af50957dca8f5cc8d481c..5c95d2d1c957026f9f8ba93b501bb919062f909b 100644
(file)
--- a/
src/src/routers/rf_get_munge_headers.c
+++ b/
src/src/routers/rf_get_munge_headers.c
@@
-2,7
+2,7
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 201
5
*/
+/* Copyright (c) University of Cambridge 1995 - 201
8
*/
/* See the file NOTICE for conditions of use and distribution. */
#include "../exim.h"
/* See the file NOTICE for conditions of use and distribution. */
#include "../exim.h"
@@
-44,7
+44,7
@@
if (rblock->extra_headers)
while ((s = string_nextinlist(&list, &sep, NULL, 0)))
if (!(s = expand_string(s)))
{
while ((s = string_nextinlist(&list, &sep, NULL, 0)))
if (!(s = expand_string(s)))
{
- if (!expand_string_forcedfail)
+ if (!
f.
expand_string_forcedfail)
{
addr->message = string_sprintf(
"%s router failed to expand add_headers item \"%s\": %s",
{
addr->message = string_sprintf(
"%s router failed to expand add_headers item \"%s\": %s",
@@
-59,7
+59,7
@@
if (rblock->extra_headers)
shared with other addresses. The output function outputs them in reverse
order. */
shared with other addresses. The output function outputs them in reverse
order. */
- header_line * h = store_get(sizeof(header_line));
+ header_line * h = store_get(sizeof(header_line)
, FALSE
);
/* We used to use string_sprintf() to add the newline if needed, but that
causes problems if the header line is exceedingly long (e.g. adding
/* We used to use string_sprintf() to add the newline if needed, but that
causes problems if the header line is exceedingly long (e.g. adding
@@
-69,7
+69,7
@@
if (rblock->extra_headers)
h->text = s;
else
{
h->text = s;
else
{
- h->text = store_get(slen+2);
+ h->text = store_get(slen+2
, is_tainted(s)
);
memcpy(h->text, s, slen);
h->text[slen++] = '\n';
h->text[slen] = 0;
memcpy(h->text, s, slen);
h->text[slen++] = '\n';
h->text[slen] = 0;
@@
-91,15
+91,15
@@
if (rblock->remove_headers)
const uschar * list = rblock->remove_headers;
int sep = ':';
uschar * s;
const uschar * list = rblock->remove_headers;
int sep = ':';
uschar * s;
-
int size = 0, len = 0
;
+
gstring * g = NULL
;
if (*remove_headers)
if (*remove_headers)
-
size = (len = Ustrlen(*remove_headers)) + 1
;
+
g = string_cat(NULL, *remove_headers)
;
while ((s = string_nextinlist(&list, &sep, NULL, 0)))
if (!(s = expand_string(s)))
{
while ((s = string_nextinlist(&list, &sep, NULL, 0)))
if (!(s = expand_string(s)))
{
- if (!expand_string_forcedfail)
+ if (!
f.
expand_string_forcedfail)
{
addr->message = string_sprintf(
"%s router failed to expand remove_headers item \"%s\": %s",
{
addr->message = string_sprintf(
"%s router failed to expand remove_headers item \"%s\": %s",
@@
-108,12
+108,15
@@
if (rblock->remove_headers)
}
}
else if (*s)
}
}
else if (*s)
- *remove_headers = string_append_listele(*remove_headers, &size, &len, ':', s);
+ g = string_append_listele(g, ':', s);
+
+ if (g)
+ *remove_headers = g->s;
}
return OK;
}
}
return OK;
}
-/* vi: aw ai sw=
4
+/* vi: aw ai sw=
2
*/
/* End of rf_get_munge_headers.c */
*/
/* End of rf_get_munge_headers.c */