1:35 p.m.
Hi all:
This patch fixed some memory leaks
Lyre (2):
Fix memory leak when connection failed
Fix memory leak when releasing connection & domain
src/libvirt-php.c | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
--
1.7.3.4
C
1:35 p.m.
New subject: [libvirt] [libvirt-php 1/2] Fix memory leak when connection failed
---
src/libvirt-php.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/libvirt-php.c b/src/libvirt-php.c
index 9998fc8..e6a780a 100644
--- a/src/libvirt-php.c
+++ b/src/libvirt-php.c
@@ -788,7 +788,11 @@ PHP_FUNCTION(libvirt_connect)
efree(creds);
}
- if (conn->conn == NULL) RETURN_FALSE;
+ if (conn->conn == NULL)
+ {
+ efree (conn);
+ RETURN_FALSE;
+ }
ZEND_REGISTER_RESOURCE(return_value, conn, le_libvirt_connection);
conn->resource_id=Z_LVAL_P(return_value);
}
--
1.7.3.4
+
1:35 p.m.
New subject: [libvirt] [libvirt-php 2/2] Fix memory leak when releasing connection & domain
---
src/libvirt-php.c | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/src/libvirt-php.c b/src/libvirt-php.c
index e6a780a..ce9d0b9 100644
--- a/src/libvirt-php.c
+++ b/src/libvirt-php.c
@@ -291,10 +291,17 @@ static void php_libvirt_connection_dtor(zend_rsrc_list_entry *rsrc
TSRMLS_DC)
php_libvirt_connection *conn = (php_libvirt_connection*)rsrc->ptr;
int rv;
- rv = virConnectClose(conn->conn);
- if (rv!=0)
- php_error_docref(NULL TSRMLS_CC, E_WARNING,"virConnectClose failed with %i on
destructor: %s", rv, LIBVIRT_G (last_error));
- conn->conn=NULL;
+ if (conn != NULL)
+ {
+ if (conn->conn != NULL)
+ {
+ rv = virConnectClose(conn->conn);
+ if (rv!=0)
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,"virConnectClose failed with %i on
destructor: %s", rv, LIBVIRT_G (last_error));
+ conn->conn=NULL;
+ }
+ efree (conn);
+ }
}
/* Destructor for domain resource */
@@ -303,10 +310,17 @@ static void php_libvirt_domain_dtor(zend_rsrc_list_entry *rsrc
TSRMLS_DC)
php_libvirt_domain *domain = (php_libvirt_domain*)rsrc->ptr;
int rv;
- rv = virDomainFree (domain->domain);
- if (rv != 0)
- php_error_docref(NULL TSRMLS_CC, E_WARNING,"virDomainFree failed with %i on
destructor: %s", rv, LIBVIRT_G (last_error));
- domain->domain=NULL;
+ if (domain != NULL)
+ {
+ if (domain->domain != NULL)
+ {
+ rv = virDomainFree (domain->domain);
+ if (rv != 0)
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,"virDomainFree failed with %i on
destructor: %s", rv, LIBVIRT_G (last_error));
+ domain->domain=NULL;
+ }
+ efree (domain);
+ }
}
/* Destructor for storagepool resource */
--
1.7.3.4
�
1:40 p.m.
On 04/12/2011 11:35 AM, Lyre wrote:
Hi all:
This patch fixed some memory leaks
Lyre (2):
Fix memory leak when connection failed
Fix memory leak when releasing connection & domain
src/libvirt-php.c | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
Good thing to fix those memory leaks, ACKed and pushed series.
Michal
--
Michal Novotny <minovotn(a)redhat.com>, RHCE
Virtualization Team (xen userspace), Red Hat
5123
days inactive
5123
days old
3 comments
2 participants
participants (2)
-
Lyre -
Michal Novotny