[libvirt] [PATCH] qemu: avoid null dereference on failed migration

Eric Blake ebb9 at byu.net
Fri Feb 26 17:17:53 UTC 2010


From: Eric Blake <eblake at redhat.com>

* src/qemu/qemu_monitor_text.c
(qemuMonitorTextGetMigrationStatus): Check for failed strchr, to
silence a coverity warning.

Signed-off-by: Eric Blake <eblake at redhat.com>
---
 src/qemu/qemu_monitor_text.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
index 62ffcc6..e7b4b1f 100644
--- a/src/qemu/qemu_monitor_text.c
+++ b/src/qemu/qemu_monitor_text.c
@@ -989,6 +989,11 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,
     if ((tmp = strstr(reply, MIGRATION_PREFIX)) != NULL) {
         tmp += strlen(MIGRATION_PREFIX);
         end = strchr(tmp, '\r');
+        if (end == NULL) {
+            qemuReportError(VIR_ERR_INTERNAL_ERROR,
+                            _("unexpected migration status in %s"), reply);
+            goto cleanup;
+        }
         *end = '\0';

         if ((*status = qemuMonitorMigrationStatusTypeFromString(tmp)) < 0) {
-- 
1.6.6.1




More information about the libvir-list mailing list