diff options
author | Sebastian Berg <sebastian@sipsolutions.net> | 2021-05-13 21:42:49 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-13 21:42:49 -0700 |
commit | c33992faa1d0686c992ff1b51cbbb871c755a59a (patch) | |
tree | 1b04b12e5adca462c9a6e075aacc82f78062fe46 /numpy | |
parent | fb4ea911607a81ef6633b857122e34229075705e (diff) | |
parent | 853dba482e6e71d3763a005b70dfd95d8857dddc (diff) | |
download | numpy-c33992faa1d0686c992ff1b51cbbb871c755a59a.tar.gz |
Merge pull request #19007 from cgohlke/patch-1
BUG: fix potential use of null pointer in nditer buffers
Diffstat (limited to 'numpy')
-rw-r--r-- | numpy/core/src/multiarray/nditer_constr.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/numpy/core/src/multiarray/nditer_constr.c b/numpy/core/src/multiarray/nditer_constr.c index 2197fe798..a0154e474 100644 --- a/numpy/core/src/multiarray/nditer_constr.c +++ b/numpy/core/src/multiarray/nditer_constr.c @@ -594,8 +594,10 @@ NpyIter_Copy(NpyIter *iter) if (buffers[iop] == NULL) { out_of_memory = 1; } - if (PyDataType_FLAGCHK(dtypes[iop], NPY_NEEDS_INIT)) { - memset(buffers[iop], '\0', itemsize*buffersize); + else { + if (PyDataType_FLAGCHK(dtypes[iop], NPY_NEEDS_INIT)) { + memset(buffers[iop], '\0', itemsize*buffersize); + } } } } |