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
GnuTLS: clear errno before any data i/o op, so error logging does not see stale values
[exim.git]
/
src
/
src
/
utf8.c
diff --git
a/src/src/utf8.c
b/src/src/utf8.c
index 4647785b9da36fdb2492c15618568e85bf60cf91..529a9a6604c26b86d213b1f6c524a7f593c3b22d 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. */
@@
-97,8
+97,7
@@
string_domain_alabel_to_utf8(const uschar * alabel, uschar ** err)
#ifdef SUPPORT_I18N_2008
const uschar * label;
int sep = '.';
#ifdef SUPPORT_I18N_2008
const uschar * label;
int sep = '.';
-uschar * s = NULL;
-int size = 0, len = 0;
+gstring * g = NULL;
while (label = string_nextinlist(&alabel, &sep, NULL, 0))
if ( string_is_alabel(label)
while (label = string_nextinlist(&alabel, &sep, NULL, 0))
if ( string_is_alabel(label)
@@
-106,8
+105,8
@@
while (label = string_nextinlist(&alabel, &sep, NULL, 0))
)
return NULL;
else
)
return NULL;
else
-
s = string_append_listele(s, &size, &len
, '.', label);
-return s;
+
g = string_append_listele(g
, '.', label);
+return s
tring_from_gstring(g)
;
#else
#else
@@
-144,7
+143,7
@@
if (!string_is_utf8(utf8)) return string_copy(utf8);
p = (punycode_uint *) stringprep_utf8_to_ucs4(CCS utf8, -1, &ucs4_len);
p_len = ucs4_len*4; /* this multiplier is pure guesswork */
p = (punycode_uint *) stringprep_utf8_to_ucs4(CCS utf8, -1, &ucs4_len);
p_len = ucs4_len*4; /* this multiplier is pure guesswork */
-res = store_get(p_len+5);
+res = store_get(p_len+5
, is_tainted(utf8)
);
res[0] = 'x'; res[1] = 'n'; res[2] = res[3] = '-';
res[0] = 'x'; res[1] = 'n'; res[2] = res[3] = '-';
@@
-173,7
+172,7
@@
uschar * s, * res;
DEBUG(D_expand) debug_printf("l_a2u: '%s'\n", alabel);
alabel += 4;
p_len = Ustrlen(alabel);
DEBUG(D_expand) debug_printf("l_a2u: '%s'\n", alabel);
alabel += 4;
p_len = Ustrlen(alabel);
-p =
(punycode_uint *) store_get((p_len+1) * sizeof(*p
));
+p =
store_get((p_len+1) * sizeof(*p), is_tainted(alabel
));
if ((rc = punycode_decode(p_len, CCS alabel, &p_len, p, NULL)) != PUNYCODE_SUCCESS)
{
if ((rc = punycode_decode(p_len, CCS alabel, &p_len, p, NULL)) != PUNYCODE_SUCCESS)
{
@@
-209,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);