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
Keep router-variables separate on addrs, to avoid taint contamination
[exim.git]
/
src
/
src
/
utf8.c
diff --git
a/src/src/utf8.c
b/src/src/utf8.c
index dcc944af93516ffb90e4f797f092609d7776a027..dec72280fb17ea9c0253fcefaace12a405a47f55 100644
(file)
--- a/
src/src/utf8.c
+++ b/
src/src/utf8.c
@@
-2,7
+2,7
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) Jeremy Harris 2015
, 2016
*/
+/* Copyright (c) Jeremy Harris 2015
- 2018
*/
/* See the file NOTICE for conditions of use and distribution. */
/* See the file NOTICE for conditions of use and distribution. */
@@
-208,15
+208,13
@@
Return NULL on error, with (optional) errstring pointer filled in
uschar *
string_address_utf8_to_alabel(const uschar * utf8, uschar ** err)
{
uschar *
string_address_utf8_to_alabel(const uschar * utf8, uschar ** err)
{
-const uschar * s;
-uschar * l;
-uschar * d;
+uschar * l, * d;
if (!*utf8) return string_copy(utf8);
DEBUG(D_expand) debug_printf("addr from utf8 <%s>", utf8);
if (!*utf8) return string_copy(utf8);
DEBUG(D_expand) debug_printf("addr from utf8 <%s>", utf8);
-for (s = utf8; *s; s++)
+for (
const uschar *
s = utf8; *s; s++)
if (*s == '@')
{
l = string_copyn(utf8, s - utf8);
if (*s == '@')
{
l = string_copyn(utf8, s - utf8);