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
SPDX: Mass-update to GPL-2.0-or-later
[exim.git]
/
src
/
src
/
rfc2047.c
diff --git
a/src/src/rfc2047.c
b/src/src/rfc2047.c
index 039c8493e54a42f07c28c70129dcb154c519ffd1..c40518a5d340b91be1979d4a172597703c988c76 100644
(file)
--- a/
src/src/rfc2047.c
+++ b/
src/src/rfc2047.c
@@
-2,8
+2,10
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
/* See the file NOTICE for conditions of use and distribution. */
/* Copyright (c) University of Cambridge 1995 - 2018 */
/* See the file NOTICE for conditions of use and distribution. */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
/* This file contains a function for decoding message header lines that may
contain encoded "words" according to the rules described in
/* This file contains a function for decoding message header lines that may
contain encoded "words" according to the rules described in
@@
-46,7
+48,7
@@
rfc2047_qpdecode(uschar *string, uschar **ptrptr)
int len = 0;
uschar *ptr;
int len = 0;
uschar *ptr;
-ptr = *ptrptr = store_get(Ustrlen(string) + 1,
is_tainted(string)
); /* No longer than this */
+ptr = *ptrptr = store_get(Ustrlen(string) + 1,
string
); /* No longer than this */
while (*string != 0)
{
while (*string != 0)
{
@@
-185,8
+187,8
@@
Returns: the decoded, converted string, or NULL on error; if there are
*/
uschar *
*/
uschar *
-rfc2047_decode2(uschar *string, BOOL lencheck,
uschar *target, int zeroval
,
- int *lenptr, int *sizeptr, uschar **error)
+rfc2047_decode2(uschar *string, BOOL lencheck,
const uschar *target
,
+ int
zeroval, int
*lenptr, int *sizeptr, uschar **error)
{
int size = Ustrlen(string);
size_t dlen;
{
int size = Ustrlen(string);
size_t dlen;
@@
-208,7
+210,7
@@
building the result as we go. The result may be longer than the input if it is
translated into a multibyte code such as UTF-8. That's why we use the dynamic
string building code. */
translated into a multibyte code such as UTF-8. That's why we use the dynamic
string building code. */
-yield = store_get(sizeof(gstring) + ++size,
is_tainted(string)
);
+yield = store_get(sizeof(gstring) + ++size,
string
);
yield->size = size;
yield->ptr = 0;
yield->s = US(yield + 1);
yield->size = size;
yield->ptr = 0;
yield->s = US(yield + 1);
@@
-335,7
+337,7
@@
return string_from_gstring(yield);
argument. */
uschar *
argument. */
uschar *
-rfc2047_decode(uschar *string, BOOL lencheck, uschar *target, int zeroval,
+rfc2047_decode(uschar *string, BOOL lencheck,
const
uschar *target, int zeroval,
int *lenptr, uschar **error)
{
return rfc2047_decode2(string, lencheck, target, zeroval, lenptr, NULL, error);
int *lenptr, uschar **error)
{
return rfc2047_decode2(string, lencheck, target, zeroval, lenptr, NULL, error);