Changeset 7876b67 for python/ext

Timestamp:

May 13, 2016, 5:22:32 PM (9 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

ff89a06

Parents:

dee266f

Message:

python/ext/py-filterbank.c: fix error message formatting, do not delete if not created

File:

• python/ext/py-filterbank.c (modified) (2 diffs)

python/ext/py-filterbank.c

@@ -60 +60 @@
   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;
   }
@@ -74 +72 @@
 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);
 }