41 lines
1.6 KiB
Diff
41 lines
1.6 KiB
Diff
From 78eb8b60d59662271c4a9a1be8c9002ee84dc8cf Mon Sep 17 00:00:00 2001
|
|
From: Richard W.M. Jones <rjones@redhat.com>
|
|
Date: Wed, 25 May 2011 17:52:26 +0100
|
|
Subject: [PATCH] json: Avoid passing large positive 64 bit integers to QMP.
|
|
|
|
http://lists.gnu.org/archive/html/qemu-devel/2011-05/threads.html#02162
|
|
|
|
Currently, qemu silently clips any JSON integer in the range
|
|
0x8000000000000000 - 0xffffffffffffffff (all numbers in this range
|
|
will be clipped to 0x7fffffffffffffff == LLONG_MAX).
|
|
|
|
To avoid this, pass these as signed 64 bit integers in the QMP
|
|
request.
|
|
---
|
|
src/qemu/qemu_monitor_json.c | 9 +++++++--
|
|
1 files changed, 7 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
|
|
index 2d8a390..bdd0dcb 100644
|
|
--- a/src/qemu/qemu_monitor_json.c
|
|
+++ b/src/qemu/qemu_monitor_json.c
|
|
@@ -413,8 +413,13 @@ qemuMonitorJSONMakeCommand(const char *cmdname,
|
|
ret = virJSONValueObjectAppendNumberLong(jargs, key, val);
|
|
} break;
|
|
case 'U': {
|
|
- unsigned long long val = va_arg(args, unsigned long long);
|
|
- ret = virJSONValueObjectAppendNumberUlong(jargs, key, val);
|
|
+ /* qemu silently truncates numbers larger than LLONG_MAX,
|
|
+ * so passing the full range of unsigned 64 bit integers
|
|
+ * is not safe here. Pass them as signed 64 bit integers
|
|
+ * instead.
|
|
+ */
|
|
+ long long val = va_arg(args, long long);
|
|
+ ret = virJSONValueObjectAppendNumberLong(jargs, key, val);
|
|
} break;
|
|
case 'd': {
|
|
double val = va_arg(args, double);
|
|
--
|
|
1.7.5.1
|
|
|