Changeset 6a72ff0

Timestamp:

Aug 20, 2016, 7:41:23 PM (8 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:

5d8cc71

Parents:

773a7f3

Message:

python/lib/gen_code.py: improve del_ function, safer DECREF, fix indentation, emit RuntimeError?

File:

• python/lib/gen_code.py (modified) (2 diffs)

python/lib/gen_code.py

@@ -307 +307 @@
   // return -1 and set error string on failure
   if (self->o == NULL) {{
-    PyErr_Format (PyExc_Exception, "failed creating {shortname}");
+    PyErr_Format (PyExc_RuntimeError, "failed creating {shortname}");
     return -1;
   }}
@@ -349 +349 @@
             if input_param['type'] == 'fmat_t *':
                 out += """
-    free(self->{0[name]}.data);""".format(input_param)
+  free(self->{0[name]}.data);""".format(input_param)
         for o in self.outputs:
             name = o['name']
             del_out = delfromtype_fn[o['type']]
             out += """
-    {del_out}(self->{name});""".format(del_out = del_out, name = name)
+  if (self->{name}) {{
+    {del_out}(self->{name});
+  }}""".format(del_out = del_out, name = name)
         del_fn = get_name(self.del_proto)
         out += """
-    if (self->o) {{
-        {del_fn}(self->o);
-    }}
-    Py_TYPE(self)->tp_free((PyObject *) self);
+  if (self->o) {{
+    {del_fn}(self->o);
+  }}
+  Py_TYPE(self)->tp_free((PyObject *) self);
 }}
 """.format(del_fn = del_fn)