]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: avoid null dereference on failed migration
authorEric Blake <eblake@redhat.com>
Mon, 1 Mar 2010 14:34:33 +0000 (15:34 +0100)
committerDaniel Veillard <veillard@redhat.com>
Mon, 1 Mar 2010 14:34:33 +0000 (15:34 +0100)
* src/qemu/qemu_monitor_text.c: qemuMonitorTextGetMigrationStatus: Check for
  failed strchr, to silence a coverity warning.

src/qemu/qemu_monitor_text.c

index 62ffcc69287b0530547c351ba1980be00a2f9352..e7b4b1fe61e681f457d564179ae6f18ea6fdb05b 100644 (file)
@@ -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) {