[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, wheezy, updated. debian/0.9.12-11-2-g90d8287

Guido Günther agx at sigxcpu.org
Thu Apr 25 19:45:54 UTC 2013


The following commit has been merged in the wheezy branch:
commit 90d828736f37df61fb6a94cce2a6b1e4de6bffd0
Author: Luca Tettamanti <ltettamanti at acunu.com>
Date:   Thu Apr 25 21:43:57 2013 +0200

    Backport upstream 71da3b66 (fix leak in virStorageBackendLogicalMakeVol)

diff --git a/debian/patches/fix-leak-virStorageBackendLogicalMakeVol.patch b/debian/patches/fix-leak-virStorageBackendLogicalMakeVol.patch
new file mode 100644
index 0000000..013d931
--- /dev/null
+++ b/debian/patches/fix-leak-virStorageBackendLogicalMakeVol.patch
@@ -0,0 +1,31 @@
+From: Luca Tettamanti <ltettamanti at acunu.com>
+Date: Thu, 25 Apr 2013 21:44:30 +0200
+Subject: Backport upstream 71da3b66 (fix leak in virStorageBackendLogicalMakeVol)
+
+===================================================================
+---
+ src/storage/storage_backend_logical.c |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c
+index 9a91dd9..7abb17b 100644
+--- a/src/storage/storage_backend_logical.c
++++ b/src/storage/storage_backend_logical.c
+@@ -204,13 +204,16 @@ virStorageBackendLogicalMakeVol(virStoragePoolObjPtr pool,
+     if (err != 0) {
+         char error[100];
+         regerror(err, reg, error, sizeof(error));
++        regfree(reg);
+         virStorageReportError(VIR_ERR_INTERNAL_ERROR,
+                               _("Failed to compile regex %s"),
+                               error);
+         goto cleanup;
+     }
+ 
+-    if (regexec(reg, groups[3], nvars, vars, 0) != 0) {
++    err = regexec(reg, groups[3], nvars, vars, 0);
++    regfree(reg);
++    if (err != 0) {
+         virStorageReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                               _("malformed volume extent devices value"));
+         goto cleanup;
diff --git a/debian/patches/series b/debian/patches/series
index d50e01f..5e1cbe7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -19,3 +19,4 @@ qemu-Fix-off-by-one-error-while-unescaping-monitor-s.patch
 rpc-Fix-crash-on-error-paths-of-message-dispatching.patch
 qemu-Add-support-for-no-user-config.patch
 debian/Allow-xen-toolstack-to-find-it-s-binaries.patch
+fix-leak-virStorageBackendLogicalMakeVol.patch

-- 
Libvirt Debian packaging



More information about the Pkg-libvirt-commits mailing list