Changeset 966c650 for python/ext/py-source.c

Timestamp:

Dec 23, 2018, 5:46:47 AM (6 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/timestretch, fix/ffmpeg5, master

Children:

cd46892

Parents:

79dc9ad

Message:

[py] take a copy for the last source block when iterating

Appears to be the simplest solution to prevent resizing internal objects.
See also 8e76c71.

File:

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

python/ext/py-source.c

@@ -582 +582 @@
     } else if (PyLong_AsLong(size) > 0) {
       // short read, return a shorter array
-      PyArrayObject *shortread = (PyArrayObject*)PyTuple_GetItem(done, 0);
+      PyObject *vec = PyTuple_GetItem(done, 0);
+      // take a copy to prevent resizing internal arrays
+      PyArrayObject *shortread = PyArray_FROM_OTF(vec, NPY_NOTYPE,
+          NPY_ARRAY_ENSURECOPY);
       PyArray_Dims newdims;
       PyObject *reshaped;
@@ -595 +598 @@
       reshaped = PyArray_Newshape(shortread, &newdims, NPY_CORDER);
       Py_DECREF(shortread);
+      Py_DECREF(vec);
       return reshaped;
     } else {