[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/28] qapi: fix potential segfault for visit_type_s
From: |
Michael Roth |
Subject: |
[Qemu-devel] [PATCH 13/28] qapi: fix potential segfault for visit_type_size() |
Date: |
Wed, 31 Oct 2012 17:35:57 -0500 |
visit_type_size() was added for use-cases currently only encountered by
OptsVisitor users, which implements a specific handler for
visit_type_size(). For Visitor implementations that don't implement the
handler, we fallback to using v->type_uint64().
However, some visitor implementations, such as Qmp*Visitor, also rely on
fallback code to handle visit_type_uint64() calls, and leave v->type_uint64
unset. This leads to a segfault when we try to use visit_type_size().
Fix this by calling the visit_type_uint64() function in visit_type_size()'s
fallback instead of calling v->type_uint64() directly.
Signed-off-by: Michael Roth <address@hidden>
---
qapi/qapi-visit-core.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/qapi/qapi-visit-core.c b/qapi/qapi-visit-core.c
index 9a74ed0..dd28cb9 100644
--- a/qapi/qapi-visit-core.c
+++ b/qapi/qapi-visit-core.c
@@ -237,7 +237,11 @@ void visit_type_int64(Visitor *v, int64_t *obj, const char
*name, Error **errp)
void visit_type_size(Visitor *v, uint64_t *obj, const char *name, Error **errp)
{
if (!error_is_set(errp)) {
- (v->type_size ? v->type_size : v->type_uint64)(v, obj, name, errp);
+ if (v->type_size) {
+ v->type_size(v, obj, name, errp);
+ } else {
+ visit_type_uint64(v, obj, name, errp);
+ }
}
}
--
1.7.9.5
- [Qemu-devel] [PATCH 03/28] qapi: qapi-commands.py -> qapi_commands.py, (continued)
- [Qemu-devel] [PATCH 03/28] qapi: qapi-commands.py -> qapi_commands.py, Michael Roth, 2012/10/31
- [Qemu-devel] [PATCH 06/28] qapi: qapi_visit.py, support generating static functions, Michael Roth, 2012/10/31
- [Qemu-devel] [PATCH 02/28] qapi: qapi-types.py -> qapi_types.py, Michael Roth, 2012/10/31
- [Qemu-devel] [PATCH 04/28] qapi: qapi_visit.py, make code useable as module, Michael Roth, 2012/10/31
- [Qemu-devel] [PATCH 05/28] qapi: qapi_visit.py, support arrays and complex qapi definitions, Michael Roth, 2012/10/31
- [Qemu-devel] [PATCH 07/28] qapi: qapi_visit.py, support for visiting non-pointer/embedded structs, Michael Roth, 2012/10/31
- [Qemu-devel] [PATCH 08/28] qapi: qapi_visit.py, support for q_string annotations, Michael Roth, 2012/10/31
- [Qemu-devel] [PATCH 11/28] qapi: QmpInputVisitor, implement array handling, Michael Roth, 2012/10/31
- [Qemu-devel] [PATCH 16/28] qapi: qapi.py, make json parser more robust, Michael Roth, 2012/10/31
- [Qemu-devel] [PATCH 14/28] qapi: add visit_type_long(), Michael Roth, 2012/10/31
- [Qemu-devel] [PATCH 13/28] qapi: fix potential segfault for visit_type_size(),
Michael Roth <=
- [Qemu-devel] [PATCH 09/28] qapi: add visitor interfaces for C arrays, Michael Roth, 2012/10/31
- [Qemu-devel] [PATCH 12/28] qapi: QmpInputVisitor, don't re-allocate memory in start_struct, Michael Roth, 2012/10/31
- [Qemu-devel] [PATCH 19/28] qom-fuse: force single-threaded mode to avoid QMP races, Michael Roth, 2012/10/31
- [Qemu-devel] [PATCH 20/28] qom-fuse: workaround for truncated properties > 4096, Michael Roth, 2012/10/31
- [Qemu-devel] [PATCH 10/28] qapi: QmpOutputVisitor, implement array handling, Michael Roth, 2012/10/31
- [Qemu-devel] [PATCH 15/28] qapi: ordereddict, add to_json() method, Michael Roth, 2012/10/31
- [Qemu-devel] [PATCH 22/28] qdev: move Property-related declarations to qdev-properties.h, Michael Roth, 2012/10/31
- [Qemu-devel] [PATCH 21/28] module additions for schema registration, Michael Roth, 2012/10/31
- [Qemu-devel] [PATCH 17/28] qapi: add open-coded visitors for struct tm/Int128 types, Michael Roth, 2012/10/31
- [Qemu-devel] [PATCH 18/28] qapi: Improve existing docs and document annotated QAPI types, Michael Roth, 2012/10/31