On 6/4/20 11:44 AM, Marc-André Lureau wrote:
> Since commit 781f2b3d1e ("qga: process_event() simplification"),
> send_response() is called unconditionally, but will assert when "rsp" is
> NULL. This may happen with QCO_NO_SUCCESS_RESP commands, such as
> "guest-shutdown".
>
> Fixes: 781f2b3d1e5ef389b44016a897fd55e7a780bf35
> Cc: Michael Roth <mdr...@linux.vnet.ibm.com>
> Reported-by: Christian Ehrhardt <christian.ehrha...@canonical.com>
> Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com>
> ---
> qga/main.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/qga/main.c b/qga/main.c
> index f0e454f28d3..3febf3b0fdf 100644
> --- a/qga/main.c
> +++ b/qga/main.c
> @@ -531,7 +531,11 @@ static int send_response(GAState *s, const QDict *rsp)
> QString *payload_qstr, *response_qstr;
> GIOStatus status;
>
> - g_assert(rsp && s->channel);
> + g_assert(s->channel);
> +
> + if (!rsp) {
> + return 0;
> + }
Why not assert after the check?
Anyway:
Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com>
>
> payload_qstr = qobject_to_json(QOBJECT(rsp));
> if (!payload_qstr) {
>
