From bef10f9a058454ca90fc2eee7c4de182b836d5fd Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Mon, 1 Mar 2010 15:34:33 +0100 Subject: [PATCH] qemu: avoid null dereference on failed migration * src/qemu/qemu_monitor_text.c: qemuMonitorTextGetMigrationStatus: Check for failed strchr, to silence a coverity warning. --- src/qemu/qemu_monitor_text.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 62ffcc6928..e7b4b1fe61 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) {