From 0cca53921d133d51cb4f8f11ae85b1eac4f9b9da Mon Sep 17 00:00:00 2001
From: Eric Blake <eblake@redhat.com>
Date: Mon, 14 Feb 2011 17:34:05 -0700
Subject: [PATCH] qemu: avoid NULL deref on error

* src/qemu/qemu_command.c (qemuParseCommandLineDisk): Report error
before cleaning def.
---
 src/qemu/qemu_command.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 3ba095049d..1687203245 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -4603,9 +4603,10 @@ qemuParseCommandLineDisk(virCapsPtr caps,
                     host = def->src + strlen("nbd:");
                     port = strchr(host, ':');
                     if (!port) {
-                        def = NULL;
                         qemuReportError(VIR_ERR_INTERNAL_ERROR,
-                                        _("cannot parse nbd filename '%s'"), def->src);
+                                        _("cannot parse nbd filename '%s'"),
+                                        def->src);
+                        def = NULL;
                         goto cleanup;
                     }
                     *port++ = '\0';