aboutsummaryrefslogtreecommitdiff
path: root/qga
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2020-06-04 11:44:25 +0200
committerMichael Roth <mdroth@linux.vnet.ibm.com>2020-07-13 17:17:08 -0500
commit844bd70b5652f30bbace89499f513e3fbbb6457a (patch)
tree52b101f477658e0486fc444fb2febd48c9557c05 /qga
parent917ebcb170273913bca33d44263bc5fd14f72fd7 (diff)
downloadqemu-844bd70b5652f30bbace89499f513e3fbbb6457a.zip
qemu-844bd70b5652f30bbace89499f513e3fbbb6457a.tar.gz
qemu-844bd70b5652f30bbace89499f513e3fbbb6457a.tar.bz2
qga: fix assert regression on guest-shutdown
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 <mdroth@linux.vnet.ibm.com> Reported-by: Christian Ehrhardt <christian.ehrhardt@canonical.com> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Christian Ehrhardt <christian.ehrhardt@canonical.com> Tested-by: Christian Ehrhardt <christian.ehrhardt@canonical.com> Cc: qemu-stable@nongnu.org Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Diffstat (limited to 'qga')
-rw-r--r--qga/main.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/qga/main.c b/qga/main.c
index f0e454f..3febf3b 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;
+ }
payload_qstr = qobject_to_json(QOBJECT(rsp));
if (!payload_qstr) {