Merge pull request numpy#19007 from cgohlke/patch-1

seberg · web-flow · commit c33992faa1d0 · 2021-05-13T21:42:49.000-07:00
BUG: fix potential use of null pointer in nditer buffers
diff --git 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);
+                        }
                     }
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -594,8 +594,10 @@ NpyIter_Copy(NpyIter *iter)`
`594`	`594`	`if (buffers[iop] == NULL) {`
`595`	`595`	`out_of_memory = 1;`
`596`	`596`	`}`
`597`		`- if (PyDataType_FLAGCHK(dtypes[iop], NPY_NEEDS_INIT)) {`
`598`		`- memset(buffers[iop], '\0', itemsize*buffersize);`
	`597`	`+ else {`
	`598`	`+ if (PyDataType_FLAGCHK(dtypes[iop], NPY_NEEDS_INIT)) {`
	`599`	`+ memset(buffers[iop], '\0', itemsize*buffersize);`
	`600`	`+ }`
`599`	`601`	`}`
`600`	`602`	`}`
`601`	`603`	`}`