[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 01/19] qapi-commands.py: Don't call the output marsh
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 01/19] qapi-commands.py: Don't call the output marshal on error |
Date: |
Mon, 24 Oct 2011 11:26:54 -0200 |
Today we generate something like this:
int qmp_marshal_input_query_foo(...)
...
retval = qmp_query_foo(errp);
qmp_marshal_output_query_foo(retval, ret, errp);
...
However, if qmp_query_foo() fails 'retval' will probably be NULL,
which can cause a segfault as not all visitors check if 'retval'
is valid.
This commit fixes that by changing the code generator to only
call the output marshal if qmp_query_foo() succeeds, like this:
retval = qmp_query_foo(errp);
if (!error_is_set(errp)) {
qmp_marshal_output_query_foo(retval, ret, errp);
}
Signed-off-by: Luiz Capitulino <address@hidden>
---
scripts/qapi-commands.py | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py
index c947ba4..f7def16 100644
--- a/scripts/qapi-commands.py
+++ b/scripts/qapi-commands.py
@@ -62,7 +62,9 @@ def gen_sync_call(name, args, ret_type, indent=0):
name=c_var(name), args=arglist, retval=retval).rstrip()
if ret_type:
ret += "\n" + mcgen(''''
-%(marshal_output_call)s
+if (!error_is_set(errp)) {
+ %(marshal_output_call)s
+}
''',
marshal_output_call=gen_marshal_output_call(name,
ret_type)).rstrip()
pop_indent(indent)
--
1.7.7.1.431.g10b2a
- [Qemu-devel] [PATCH v1 00/19]: QAPI conversions round 2, Luiz Capitulino, 2011/10/24
- [Qemu-devel] [PATCH 04/19] Monitor: Make mon_set_cpu() public, Luiz Capitulino, 2011/10/24
- [Qemu-devel] [PATCH 02/19] qapi: Convert query-mice, Luiz Capitulino, 2011/10/24
- [Qemu-devel] [PATCH 01/19] qapi-commands.py: Don't call the output marshal on error,
Luiz Capitulino <=
- [Qemu-devel] [PATCH 03/19] qapi: Convert query-migrate, Luiz Capitulino, 2011/10/24
- [Qemu-devel] [PATCH 07/19] qapi: Convert query-cpus, Luiz Capitulino, 2011/10/24
- [Qemu-devel] [PATCH 05/19] Monitor: Introduce monitor_get_cpu_index(), Luiz Capitulino, 2011/10/24
- [Qemu-devel] [PATCH 09/19] block: Rename the BlockIOStatus enum values, Luiz Capitulino, 2011/10/24
- [Qemu-devel] [PATCH 06/19] qapi: Convert the cpu command, Luiz Capitulino, 2011/10/24
- [Qemu-devel] [PATCH 13/19] qapi: Convert query-vnc, Luiz Capitulino, 2011/10/24
- [Qemu-devel] [PATCH 10/19] qapi: Convert query-block, Luiz Capitulino, 2011/10/24
- [Qemu-devel] [PATCH 11/19] qapi: Convert query-blockstats, Luiz Capitulino, 2011/10/24
- [Qemu-devel] [PATCH 19/19] Drop qemu-objects.h from modules that don't require it, Luiz Capitulino, 2011/10/24
- [Qemu-devel] [PATCH 15/19] qapi: Convert query-balloon, Luiz Capitulino, 2011/10/24