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
/
lookups
/
json.c
diff --git
a/src/src/lookups/json.c
b/src/src/lookups/json.c
index 3ca1af50d91f83c8c613a933ba2e4ac5edff34cf..43575cacff7a24f455ef068c4596f0583e39244a 100644
(file)
--- a/
src/src/lookups/json.c
+++ b/
src/src/lookups/json.c
@@
-2,9
+2,10
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c)
Jeremy Harris 2019-2020
*/
-/* Copyright (c)
The Exim Maintainers 2021
*/
+/* Copyright (c)
The Exim Maintainers 2021 - 2022
*/
+/* Copyright (c)
Jeremy Harris 2019 - 2020
*/
/* 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 "lf_functions.h"
#include "../exim.h"
#include "lf_functions.h"
@@
-24,7
+25,7
@@
Assume that the file is trusted, so no tainting */
static void *
json_malloc(size_t nbytes)
{
static void *
json_malloc(size_t nbytes)
{
-void * p = store_get((int)nbytes,
FALSE
);
+void * p = store_get((int)nbytes,
GET_UNTAINTED
);
/* debug_printf("%s %d: %p\n", __FUNCTION__, (int)nbytes, p); */
return p;
}
/* debug_printf("%s %d: %p\n", __FUNCTION__, (int)nbytes, p); */
return p;
}
@@
-158,10
+159,10
@@
json_close(void *handle)
#include "../version.h"
#include "../version.h"
-void
-json_version_report(
FILE *f
)
+gstring *
+json_version_report(
gstring * g
)
{
{
-
fprintf(f
, "Library version: json: Jansonn version %s\n", JANSSON_VERSION);
+
return string_fmt_append(g
, "Library version: json: Jansonn version %s\n", JANSSON_VERSION);
}
}