* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) Jeremy Harris 2019-2020 */
+/* Copyright (c) The Exim Maintainers 2021 - 2022 */
+/* Copyright (c) Jeremy Harris 2019 - 2020 */
/* See the file NOTICE for conditions of use and distribution. */
#include "../exim.h"
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;
}
json_set_alloc_funcs(json_malloc, json_free);
if (!(f = Ufopen(filename, "rb")))
- {
- int save_errno = errno;
- *errmsg = string_open_failed(errno, "%s for json search", filename);
- errno = save_errno;
- return NULL;
- }
+ *errmsg = string_open_failed("%s for json search", filename);
return f;
}
uschar * key;
int sep = 0;
-length = length; /* Keep picky compilers happy */
-do_cache = do_cache; /* Keep picky compilers happy */
-
rewind(f);
if (!(j = json_loadf(f, 0, &jerr)))
{
#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);
}