From 82617d7ce3bdeef6fa32f71f9976b2f4bf3589e9 Mon Sep 17 00:00:00 2001 From: Luiz Capitulino Date: Wed, 27 Jan 2010 18:01:17 -0200 Subject: [PATCH] Monitor: Fix command execution regression Function is_async_return() added by commit 940cc30d0d4 assumes that 'data', which is returned by handlers, is always a QDict. This is not true, as QLists can also be returned, in this case we'll get a segfault. Fix that by checking if 'data' is a QDict. Signed-off-by: Luiz Capitulino Signed-off-by: Blue Swirl --- monitor.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/monitor.c b/monitor.c index fbae5ce09f..fb7c57231a 100644 --- a/monitor.c +++ b/monitor.c @@ -3700,7 +3700,11 @@ static void monitor_print_error(Monitor *mon) static int is_async_return(const QObject *data) { - return data && qdict_haskey(qobject_to_qdict(data), "__mon_async"); + if (data && qobject_type(data) == QTYPE_QDICT) { + return qdict_haskey(qobject_to_qdict(data), "__mon_async"); + } + + return 0; } static void monitor_call_handler(Monitor *mon, const mon_cmd_t *cmd, -- 2.30.2