projects
/
aubio.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dee266f
)
python/ext/py-filterbank.c: fix error message formatting, do not delete if not created
author
Paul Brossier
<piem@piem.org>
Fri, 13 May 2016 15:22:32 +0000
(17:22 +0200)
committer
Paul Brossier
<piem@piem.org>
Fri, 13 May 2016 15:22:32 +0000
(17:22 +0200)
python/ext/py-filterbank.c
patch
|
blob
|
history
diff --git
a/python/ext/py-filterbank.c
b/python/ext/py-filterbank.c
index
a8795b0
..
a4e0ea6
100644
(file)
--- a/
python/ext/py-filterbank.c
+++ b/
python/ext/py-filterbank.c
@@
-59,10
+59,8
@@
Py_filterbank_init (Py_filterbank * self, PyObject * args, PyObject * kwds)
{
self->o = new_aubio_filterbank (self->n_filters, self->win_s);
if (self->o == NULL) {
{
self->o = new_aubio_filterbank (self->n_filters, self->win_s);
if (self->o == NULL) {
- char_t errstr[30];
- sprintf(errstr, "error creating filterbank with n_filters=%d, win_s=%d",
- self->n_filters, self->win_s);
- PyErr_SetString (PyExc_RuntimeError, errstr);
+ PyErr_Format(PyExc_RuntimeError, "error creating filterbank with"
+ " n_filters=%d, win_s=%d", self->n_filters, self->win_s);
return -1;
}
self->out = new_py_fvec(self->n_filters);
return -1;
}
self->out = new_py_fvec(self->n_filters);
@@
-73,9
+71,11
@@
Py_filterbank_init (Py_filterbank * self, PyObject * args, PyObject * kwds)
static void
Py_filterbank_del (Py_filterbank *self, PyObject *unused)
{
static void
Py_filterbank_del (Py_filterbank *self, PyObject *unused)
{
- del_aubio_filterbank(self->o);
- Py_DECREF(self->out);
- free(self->coeffs.data);
+ if (self->o) {
+ free(self->coeffs.data);
+ del_aubio_filterbank(self->o);
+ }
+ Py_XDECREF(self->out);
Py_TYPE(self)->tp_free((PyObject *) self);
}
Py_TYPE(self)->tp_free((PyObject *) self);
}