summaryrefslogtreecommitdiff
path: root/numpy
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2014-01-15 16:15:46 -0800
committerCharles Harris <charlesr.harris@gmail.com>2014-01-15 16:15:46 -0800
commit27c119af2b86c7f56de6e3660f6105453cc11468 (patch)
tree494a0d49018670b9251934ceb43700f0ee46771b /numpy
parent796ac14fb05694365fb423e5684ccac4330470f2 (diff)
parent2f8d33bc755b869639e38e0482c0abda956578cc (diff)
downloadnumpy-27c119af2b86c7f56de6e3660f6105453cc11468.tar.gz
Merge pull request #4197 from juliantaylor/memview-leak
BUG: fix minor memory leak in memoryview failure case
Diffstat (limited to 'numpy')
-rw-r--r--numpy/core/src/multiarray/buffer.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/numpy/core/src/multiarray/buffer.c b/numpy/core/src/multiarray/buffer.c
index e32bc76eb..4c1d476d5 100644
--- a/numpy/core/src/multiarray/buffer.c
+++ b/numpy/core/src/multiarray/buffer.c
@@ -444,7 +444,7 @@ static _buffer_info_t*
_buffer_info_new(PyArrayObject *arr)
{
_buffer_info_t *info;
- _tmp_string_t fmt = {0,0,0};
+ _tmp_string_t fmt = {NULL, 0, 0};
int k;
info = malloc(sizeof(_buffer_info_t));
@@ -454,6 +454,7 @@ _buffer_info_new(PyArrayObject *arr)
/* Fill in format */
if (_buffer_format_string(PyArray_DESCR(arr), &fmt, arr, NULL, NULL) != 0) {
+ free(fmt.s);
goto fail;
}
_append_char(&fmt, '\0');