Skip to content
Snippets Groups Projects
Commit e771da9e authored by Guido Günther's avatar Guido Günther Committed by Guido Günther
Browse files

drop superflous 0011-Fix-segfault-on-missing-volume-format.patch

not an issue in 0.4.6 only in 0.5.X
parent 44cb9b5b
No related branches found
No related tags found
No related merge requests found
From 9533ab9556ddf15435944ec03f6ab1730fb2e279 Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard@redhat.com>
Date: Thu, 4 Dec 2008 16:26:31 +0100
Subject: [PATCH] Fix segfault on missing volume format
Closes: #507677
---
src/storage_conf.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/storage_conf.c b/src/storage_conf.c
index f0d2b94..c22889f 100644
--- a/src/storage_conf.c
+++ b/src/storage_conf.c
@@ -752,6 +752,11 @@ virStorageVolDefParseDoc(virConnectPtr conn,
ret->target.path = virXPathString(conn, "string(/volume/target/path)", ctxt);
if (options->formatFromString) {
char *format = virXPathString(conn, "string(/volume/target/format/@type)", ctxt);
+ if (format == NULL) {
+ virStorageReportError(conn, VIR_ERR_XML_ERROR,
+ _("cannot guess missing format type for target"));
+ goto cleanup;
+ }
if ((ret->target.format = (options->formatFromString)(conn, format)) < 0) {
virStorageReportError(conn, VIR_ERR_XML_ERROR,
_("unknown volume format type %s"), format);
--
1.6.0.3
......@@ -8,4 +8,3 @@
0008-Increase-initial-qemu-monitor-read-timeout.patch
0009-Open-qemu-monitor-log-O_APPEND-instead-of-O_TRUNC.patch
0010-raise-error-on-invalid-volume-format.patch
0011-Fix-segfault-on-missing-volume-format.patch
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment