fix memory leak in QMP Client (many thanks to Stefan!)

diff --git a/Makefile b/Makefile
index 7835a2a83ce30c3409de9bd8e4aa0391552331bd..8d098f15d6ee9dff38edb4526d5a50aa7dd46123 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ RELEASE=2.2
 
 VERSION=2.0
 PACKAGE=qemu-server
-PKGREL=63
+PKGREL=64
 
 DESTDIR=
 PREFIX=/usr

diff --git a/PVE/QMPClient.pm b/PVE/QMPClient.pm
index 9829986ae77e82d340974e4d4128741ef85b4a0e..4fdb7f3b2f97afedbd3b6933f3a6cd4057dc1032 100755 (executable)
--- a/PVE/QMPClient.pm
+++ b/PVE/QMPClient.pm
@@ -7,6 +7,7 @@ use IO::Multiplex;
 use POSIX qw(EINTR EAGAIN);
 use JSON;
 use Time::HiRes qw(usleep gettimeofday tv_interval);
+use Scalar::Util qw(weaken);
 
 use Data::Dumper;
 
@@ -35,6 +36,10 @@ sub new {
 
     $mux->set_callback_object($self);
 
+    # make sure perl doesn't believe this is a circular reference as we 
+    # delete mux in DESTROY
+    weaken($mux->{_object});
+
     return $self;
 }
 

diff --git a/changelog.Debian b/changelog.Debian
index ef17485ac92a6f2ad783e9735949f577715d80d9..06cc400bddc3b48b5fa8792a74892a3b25a56619 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,3 +1,9 @@
+qemu-server (2.0-64) unstable; urgency=low
+
+  * fix memory leak in QMP Client (many thanks to Stefan!)
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 29 Oct 2012 12:14:51 +0100
+
 qemu-server (2.0-63) unstable; urgency=low
 
   * fix bug in vmtar