[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/20] qobject: qobject_from_jsonv() is dangerous, h
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 09/20] qobject: qobject_from_jsonv() is dangerous, hide it away |
Date: |
Thu, 12 Jul 2018 13:12:10 +0200 |
qobject_from_jsonv() takes ownership of %p arguments. On failure, we
can't generally know whether we failed before or after %p, so
ownership becomes indeterminate. To avoid leaks, callers passing %p
must terminate on error, e.g. by passing &error_abort. Trap for the
unwary; document and give the function internal linkage.
Signed-off-by: Markus Armbruster <address@hidden>
---
include/qapi/qmp/qjson.h | 2 --
qobject/qjson.c | 13 ++++++++++++-
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/include/qapi/qmp/qjson.h b/include/qapi/qmp/qjson.h
index 0db121bef9..4a225cf7d1 100644
--- a/include/qapi/qmp/qjson.h
+++ b/include/qapi/qmp/qjson.h
@@ -15,8 +15,6 @@
#define QJSON_H
QObject *qobject_from_json(const char *string, Error **errp);
-QObject *qobject_from_jsonv(const char *string, va_list *ap, Error **errp)
- GCC_FMT_ATTR(1, 0);
QObject *qobject_from_vjsonf_nofail(const char *string, va_list)
GCC_FMT_ATTR(1, 0);
diff --git a/qobject/qjson.c b/qobject/qjson.c
index 2e450231ff..ab4040f235 100644
--- a/qobject/qjson.c
+++ b/qobject/qjson.c
@@ -39,7 +39,18 @@ static void parse_json(JSONMessageParser *parser, GQueue
*tokens)
s->result = json_parser_parse_err(tokens, s->ap, &s->err);
}
-QObject *qobject_from_jsonv(const char *string, va_list *ap, Error **errp)
+/*
+ * Parse @string as JSON value.
+ * If @ap is non-null, interpolate %-escapes.
+ * Takes ownership of %p arguments.
+ * On success, return the JSON value.
+ * On failure, store an error through @errp and return NULL.
+ * Ownership of %p arguments becomes indeterminate then. To avoid
+ * leaks, callers passing %p must terminate on error, e.g. by passing
+ * &error_abort.
+ */
+static QObject *qobject_from_jsonv(const char *string, va_list *ap,
+ Error **errp)
{
JSONParsingState state = {};
--
2.17.1
- [Qemu-devel] [PATCH 00/20] tests: Compile-time format string checking for libqtest.h, Markus Armbruster, 2018/07/12
- [Qemu-devel] [PATCH 03/20] libqtest: Clean up how we read device_del messages, Markus Armbruster, 2018/07/12
- [Qemu-devel] [PATCH 16/20] migration-test: Make wait_command() cope with '%', Markus Armbruster, 2018/07/12
- [Qemu-devel] [PATCH 01/20] libqtest: Document calling conventions, Markus Armbruster, 2018/07/12
- [Qemu-devel] [PATCH 09/20] qobject: qobject_from_jsonv() is dangerous, hide it away,
Markus Armbruster <=
- [Qemu-devel] [PATCH 12/20] cpu-plug-test: Don't pass integers as strings to device_add, Markus Armbruster, 2018/07/12
- [Qemu-devel] [PATCH 06/20] qobject: New qobject_from_vjsonf_nofail(), qdict_from_vjsonf_nofail(), Markus Armbruster, 2018/07/12
- [Qemu-devel] [PATCH 18/20] migration-test: Clean up string interpolation into QMP, part 2, Markus Armbruster, 2018/07/12
- [Qemu-devel] [PATCH 02/20] libqtest: Rename functions to send QMP messages, Markus Armbruster, 2018/07/12