diff options
| author | Matti Picus <matti.picus@gmail.com> | 2019-01-10 19:12:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-10 19:12:30 +0200 |
| commit | 1b144ad9d45647960c009ff4fe4e1b18958ff997 (patch) | |
| tree | cbe43da82207c638530c890726942edea34b4b83 | |
| parent | 83a16723876994120f13537103f70aadb5bf7475 (diff) | |
| parent | a29e5859ab4bfd6a4b471601cca9f9b94d6dd80a (diff) | |
| download | numpy-1b144ad9d45647960c009ff4fe4e1b18958ff997.tar.gz | |
Merge pull request #12696 from seberg/bufferinfo_cache_dealloc_void
BUG: Fix leak of void scalar buffer info
| -rw-r--r-- | numpy/core/src/multiarray/buffer.c | 2 | ||||
| -rw-r--r-- | numpy/core/src/multiarray/ctors.c | 1 | ||||
| -rw-r--r-- | numpy/core/src/multiarray/scalartypes.c.src | 2 | ||||
| -rw-r--r-- | numpy/core/tests/test_multiarray.py | 1 |
4 files changed, 6 insertions, 0 deletions
diff --git a/numpy/core/src/multiarray/buffer.c b/numpy/core/src/multiarray/buffer.c index 51676f0b3..d8ad80266 100644 --- a/numpy/core/src/multiarray/buffer.c +++ b/numpy/core/src/multiarray/buffer.c @@ -583,9 +583,11 @@ _buffer_info_new(PyObject *obj) err = _buffer_format_string(descr, &fmt, obj, NULL, NULL); Py_DECREF(descr); if (err != 0) { + free(info->shape); goto fail; } if (_append_char(&fmt, '\0') < 0) { + free(info->shape); goto fail; } info->format = fmt.s; diff --git a/numpy/core/src/multiarray/ctors.c b/numpy/core/src/multiarray/ctors.c index bd70eba0c..acc4abac6 100644 --- a/numpy/core/src/multiarray/ctors.c +++ b/numpy/core/src/multiarray/ctors.c @@ -1410,6 +1410,7 @@ _array_from_buffer_3118(PyObject *memoryview) * dimensions, so the array is now 0d. */ nd = 0; + Py_DECREF(descr); descr = (PyArray_Descr *)PyObject_CallFunctionObjArgs( (PyObject *)&PyArrayDescr_Type, Py_TYPE(view->obj), NULL); if (descr == NULL) { diff --git a/numpy/core/src/multiarray/scalartypes.c.src b/numpy/core/src/multiarray/scalartypes.c.src index 2f71c8ae9..52de31289 100644 --- a/numpy/core/src/multiarray/scalartypes.c.src +++ b/numpy/core/src/multiarray/scalartypes.c.src @@ -2599,6 +2599,8 @@ NPY_NO_EXPORT PyTypeObject PyGenericArrType_Type = { static void void_dealloc(PyVoidScalarObject *v) { + _dealloc_cached_buffer_info((PyObject *)v); + if (v->flags & NPY_ARRAY_OWNDATA) { npy_free_cache(v->obval, Py_SIZE(v)); } diff --git a/numpy/core/tests/test_multiarray.py b/numpy/core/tests/test_multiarray.py index 06cabe2cb..302155c21 100644 --- a/numpy/core/tests/test_multiarray.py +++ b/numpy/core/tests/test_multiarray.py @@ -7211,6 +7211,7 @@ class TestConversion(object): except NameError: Error = RuntimeError # python < 3.5 assert_raises(Error, bool, self_containing) # previously stack overflow + self_containing[0] = None # resolve circular reference def test_to_int_scalar(self): # gh-9972 means that these aren't always the same |