[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/9] qmp-event: Avoid qobject_from_jsonf("%"PRId64)
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 1/9] qmp-event: Avoid qobject_from_jsonf("%"PRId64) |
Date: |
Mon, 5 Dec 2016 17:45:05 +0100 |
From: Eric Blake <address@hidden>
The qobject_from_jsonf() function implements a pseudo-printf
language for creating a QObject; however, it is hard-coded to
only parse a subset of formats understood by -Wformat, and is
not a straight synonym to bare printf(). In particular, any
use of an int64_t integer works only if the system's
definition of PRId64 matches what the parser expects; which
works on glibc (%lld or %ld depending on 32- vs. 64-bit) and
mingw (%I64d), but not on Mac OS (%qd). Rather than enhance
the parser, it is just as easy to use 'long long', which we
know always works. There are few enough callers of
qobject_from_json[fv]() that it is easy to audit that this is
the only non-testsuite caller that was actually relying on
this particular conversion.
Reported by: G 3 <address@hidden>
Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
[Cast tv.tv_sec, tv.tv_usec to long long for type correctness]
Signed-off-by: Markus Armbruster <address@hidden>
---
qapi/qmp-event.c | 17 ++++-------------
1 file changed, 4 insertions(+), 13 deletions(-)
diff --git a/qapi/qmp-event.c b/qapi/qmp-event.c
index 8bba165..802ede4 100644
--- a/qapi/qmp-event.c
+++ b/qapi/qmp-event.c
@@ -35,21 +35,12 @@ static void timestamp_put(QDict *qdict)
int err;
QObject *obj;
qemu_timeval tv;
- int64_t sec, usec;
err = qemu_gettimeofday(&tv);
- if (err < 0) {
- /* Put -1 to indicate failure of getting host time */
- sec = -1;
- usec = -1;
- } else {
- sec = tv.tv_sec;
- usec = tv.tv_usec;
- }
-
- obj = qobject_from_jsonf("{ 'seconds': %" PRId64 ", "
- "'microseconds': %" PRId64 " }",
- sec, usec);
+ /* Put -1 to indicate failure of getting host time */
+ obj = qobject_from_jsonf("{ 'seconds': %lld, 'microseconds': %lld }",
+ err < 0 ? -1LL : (long long)tv.tv_sec,
+ err < 0 ? -1LL : (long long)tv.tv_usec);
qdict_put_obj(qdict, "timestamp", obj);
}
--
2.5.5
- [Qemu-devel] [PULL 0/9] QAPI patches for 2016-12-05, Markus Armbruster, 2016/12/05
- [Qemu-devel] [PULL 5/9] qapi: fix schema symbol sections, Markus Armbruster, 2016/12/05
- [Qemu-devel] [PULL 6/9] qapi: fix missing symbol @prefix, Markus Armbruster, 2016/12/05
- [Qemu-devel] [PULL 3/9] tests: Avoid qobject_from_jsonf("%"PRId64), Markus Armbruster, 2016/12/05
- [Qemu-devel] [PULL 8/9] qapi: use one symbol per line, Markus Armbruster, 2016/12/05
- [Qemu-devel] [PULL 4/9] qga/schema: fix double-return in doc, Markus Armbruster, 2016/12/05
- [Qemu-devel] [PULL 2/9] test-qga: Avoid qobject_from_jsonv("%"PRId64), Markus Armbruster, 2016/12/05
- [Qemu-devel] [PULL 7/9] qapi: fix various symbols mismatch in documentation, Markus Armbruster, 2016/12/05
- [Qemu-devel] [PULL 1/9] qmp-event: Avoid qobject_from_jsonf("%"PRId64),
Markus Armbruster <=
- [Qemu-devel] [PULL 9/9] qapi: add missing colon-ending for section name, Markus Armbruster, 2016/12/05
- Re: [Qemu-devel] [PULL 0/9] QAPI patches for 2016-12-05, Stefan Hajnoczi, 2016/12/06