diff options
author | Alex Jia <ajia@redhat.com> | 2012-03-21 17:01:22 +0100 |
---|---|---|
committer | Daniel Veillard <veillard@redhat.com> | 2012-03-22 20:07:34 +0800 |
commit | 7f39fff4c0ae96e8afa02ad50fa30d325a417c7a (patch) | |
tree | b37115f39c669c709c8701ab24fc58fcdfd0a31e | |
parent | 988a7213942b521a8db7aed6233190f401242d8a (diff) | |
download | libvirt-python-v6-7f39fff4c0ae96e8afa02ad50fa30d325a417c7a.tar.gz libvirt-python-v6-7f39fff4c0ae96e8afa02ad50fa30d325a417c7a.tar.xz libvirt-python-v6-7f39fff4c0ae96e8afa02ad50fa30d325a417c7a.zip |
python: Avoid memory leaks on libvirt_virNodeGetMemoryStats
https://bugzilla.redhat.com/show_bug.cgi?id=770944
Detected by valgrind. Leaks are introduced in commit 17c7795.
* python/libvirt-override.c (libvirt_virNodeGetMemoryStats): fix memory leaks
and improve codes return value.
For details, please see the following link:
RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=770944
Signed-off-by: Alex Jia <ajia@redhat.com>
(cherry picked from commit 53b45aa494a94854862603f5694d137f928edfdd)
-rw-r--r-- | libvirt-override.c | 36 |
1 files changed, 26 insertions, 10 deletions
diff --git a/libvirt-override.c b/libvirt-override.c index 792cfa3..8ed9f73 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -2550,7 +2550,9 @@ libvirt_virNodeGetCPUStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) static PyObject * libvirt_virNodeGetMemoryStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { - PyObject *ret; + PyObject *ret = NULL; + PyObject *key = NULL; + PyObject *val = NULL; PyObject *pyobj_conn; virConnectPtr conn; unsigned int flags; @@ -2559,7 +2561,7 @@ libvirt_virNodeGetMemoryStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) virNodeMemoryStatsPtr stats = NULL; if (!PyArg_ParseTuple(args, (char *)"Oii:virNodeGetMemoryStats", &pyobj_conn, &cellNum, &flags)) - return(NULL); + return ret; conn = (virConnectPtr)(PyvirConnect_Get(pyobj_conn)); LIBVIRT_BEGIN_ALLOW_THREADS; @@ -2570,7 +2572,7 @@ libvirt_virNodeGetMemoryStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) if (nparams) { if (VIR_ALLOC_N(stats, nparams) < 0) - return VIR_PY_NONE; + return PyErr_NoMemory(); LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virNodeGetMemoryStats(conn, cellNum, stats, &nparams, flags); @@ -2580,18 +2582,32 @@ libvirt_virNodeGetMemoryStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) return VIR_PY_NONE; } } - if (!(ret = PyDict_New())) { - VIR_FREE(stats); - return VIR_PY_NONE; - } + + if (!(ret = PyDict_New())) + goto error; + for (i = 0; i < nparams; i++) { - PyDict_SetItem(ret, - libvirt_constcharPtrWrap(stats[i].field), - libvirt_ulonglongWrap(stats[i].value)); + key = libvirt_constcharPtrWrap(stats[i].field); + val = libvirt_ulonglongWrap(stats[i].value); + + if (!key || !val || PyDict_SetItem(ret, key, val) < 0) { + Py_DECREF(ret); + ret = NULL; + goto error; + } + + Py_DECREF(key); + Py_DECREF(val); } VIR_FREE(stats); return ret; + +error: + VIR_FREE(stats); + Py_XDECREF(key); + Py_XDECREF(val); + return ret; } static PyObject * |