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
tidying
[exim.git]
/
src
/
src
/
utf8.c
diff --git
a/src/src/utf8.c
b/src/src/utf8.c
index be5bcb0788176a22bc884502fda86a9ad2a5a27d..c05853838de0162bd47c1bfa921a909aa540946e 100644
(file)
--- a/
src/src/utf8.c
+++ b/
src/src/utf8.c
@@
-2,8
+2,10
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) Jeremy Harris 2015, 2016 */
+/* Copyright (c) The Exim Maintainers 2022 */
+/* 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. */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
#include "exim.h"
#include "exim.h"
@@
-52,6
+54,10
@@
uschar * s1, * s;
int rc;
#ifdef SUPPORT_I18N_2008
int rc;
#ifdef SUPPORT_I18N_2008
+/* Avoid lowercasing plain-ascii domains */
+if (!string_is_utf8(utf8))
+ return string_copy(utf8);
+
/* Only lowercase is accepted by the library call. A pity since we lose
any mixed-case annotation. This does not really matter for a domain. */
{
/* Only lowercase is accepted by the library call. A pity since we lose
any mixed-case annotation. This does not really matter for a domain. */
{
@@
-64,7
+70,7
@@
any mixed-case annotation. This does not really matter for a domain. */
break;
}
}
break;
}
}
-if ((rc = idn2_lookup_u8(
CCS
s, &s1, IDN2_NFC_INPUT)) != IDN2_OK)
+if ((rc = idn2_lookup_u8(
(const uint8_t *)
s, &s1, IDN2_NFC_INPUT)) != IDN2_OK)
{
if (err) *err = US idn2_strerror(rc);
return NULL;
{
if (err) *err = US idn2_strerror(rc);
return NULL;
@@
-93,7
+99,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;
+
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)
@@
-101,8
+107,8
@@
while (label = string_nextinlist(&alabel, &sep, NULL, 0))
)
return NULL;
else
)
return NULL;
else
-
s = string_append_listele(s
, '.', label);
-return s;
+
g = string_append_listele(g
, '.', label);
+return s
tring_from_gstring(g)
;
#else
#else
@@
-129,7
+135,7
@@
return s;
uschar *
string_localpart_utf8_to_alabel(const uschar * utf8, uschar ** err)
{
uschar *
string_localpart_utf8_to_alabel(const uschar * utf8, uschar ** err)
{
-size_t ucs4_len;
+size_t ucs4_len
= 0
;
punycode_uint * p;
size_t p_len;
uschar * res;
punycode_uint * p;
size_t p_len;
uschar * res;
@@
-138,8
+144,13
@@
int rc;
if (!string_is_utf8(utf8)) return string_copy(utf8);
p = (punycode_uint *) stringprep_utf8_to_ucs4(CCS utf8, -1, &ucs4_len);
if (!string_is_utf8(utf8)) return string_copy(utf8);
p = (punycode_uint *) stringprep_utf8_to_ucs4(CCS utf8, -1, &ucs4_len);
+if (!p || !ucs4_len)
+ {
+ if (err) *err = US"l_u2a: bad UTF-8 input";
+ return NULL;
+ }
p_len = ucs4_len*4; /* this multiplier is pure guesswork */
p_len = ucs4_len*4; /* this multiplier is pure guesswork */
-res = store_get(p_len+5);
+res = store_get(p_len+5
, utf8
);
res[0] = 'x'; res[1] = 'n'; res[2] = res[3] = '-';
res[0] = 'x'; res[1] = 'n'; res[2] = res[3] = '-';
@@
-168,7
+179,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), 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)
{
@@
-198,21
+209,19
@@
return NULL;
/* Whole address conversion.
The *err string pointer should be null before the call.
/* Whole address conversion.
The *err string pointer should be null before the call.
-Return NULL on
oee
ror, with (optional) errstring pointer filled in
+Return NULL on
er
ror, 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);
@@
-238,28
+247,29
@@
return l;
/* See a description in tls-openssl.c for an explanation of why this exists.
/* See a description in tls-openssl.c for an explanation of why this exists.
-Arguments:
a FILE* to print the results
to
-Returns:
noth
ing
+Arguments:
string to append
to
+Returns:
str
ing
*/
*/
-void
-utf8_version_report(
FILE *f
)
+gstring *
+utf8_version_report(
gstring * g
)
{
#ifdef SUPPORT_I18N_2008
{
#ifdef SUPPORT_I18N_2008
-
fprintf(f
, "Library version: IDN2: Compile: %s\n"
+
g = string_fmt_append(g
, "Library version: IDN2: Compile: %s\n"
" Runtime: %s\n",
IDN2_VERSION,
idn2_check_version(NULL));
" Runtime: %s\n",
IDN2_VERSION,
idn2_check_version(NULL));
-
fprintf(f
, "Library version: Stringprep: Compile: %s\n"
+
g = string_fmt_append(g
, "Library version: Stringprep: Compile: %s\n"
" Runtime: %s\n",
STRINGPREP_VERSION,
stringprep_check_version(NULL));
#else
" Runtime: %s\n",
STRINGPREP_VERSION,
stringprep_check_version(NULL));
#else
-
fprintf(f
, "Library version: IDN: Compile: %s\n"
+
g = string_fmt_append(g
, "Library version: IDN: Compile: %s\n"
" Runtime: %s\n",
STRINGPREP_VERSION,
stringprep_check_version(NULL));
#endif
" Runtime: %s\n",
STRINGPREP_VERSION,
stringprep_check_version(NULL));
#endif
+return g;
}
#endif /* whole file */
}
#endif /* whole file */