Message ID | 20100127180117.5cf438bf@doriath |
---|---|
State | New |
Headers | show |
Thanks, applied. On Wed, Jan 27, 2010 at 8:01 PM, Luiz Capitulino <lcapitulino@redhat.com> wrote: > > 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 <lcapitulino@redhat.com> > --- > monitor.c | 6 +++++- > 1 files changed, 5 insertions(+), 1 deletions(-) > > diff --git a/monitor.c b/monitor.c > index fbae5ce..fb7c572 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, > -- > 1.6.6 > > > >
diff --git a/monitor.c b/monitor.c index fbae5ce..fb7c572 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,
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 <lcapitulino@redhat.com> --- monitor.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)