Merge pull request #2966 from certik/backport2928

certik · certik · commit 563e754d8957 · 2013-02-04T23:50:52.000-08:00
BUG: Fix memory leak in ndarray construction from strings (gh-2927)
diff --git a/numpy/core/src/multiarray/common.c b/numpy/core/src/multiarray/common.c
@@ -485,9 +485,11 @@ PyArray_DTypeFromObjectHelper(PyObject *obj, int maxdims,
     /* Set 'out_dtype' if it's NULL */
     if (*out_dtype == NULL) {
         if (!string_type && dtype->type_num == NPY_STRING) {
+            Py_DECREF(dtype);
             return RETRY_WITH_STRING;
         }
         if (!string_type && dtype->type_num == NPY_UNICODE) {
+            Py_DECREF(dtype);
             return RETRY_WITH_UNICODE;
         }
         *out_dtype = dtype;
@@ -500,17 +502,19 @@ PyArray_DTypeFromObjectHelper(PyObject *obj, int maxdims,
         if (res_dtype == NULL) {
             return -1;
         }
-        Py_DECREF(*out_dtype);
         if (!string_type &&
                 res_dtype->type_num == NPY_UNICODE &&
                 (*out_dtype)->type_num != NPY_UNICODE) {
+            Py_DECREF(res_dtype);
             return RETRY_WITH_UNICODE;
         }
         if (!string_type &&
                 res_dtype->type_num == NPY_STRING &&
                 (*out_dtype)->type_num != NPY_STRING) {
+            Py_DECREF(res_dtype);
             return RETRY_WITH_STRING;
         }
+        Py_DECREF(*out_dtype);
         *out_dtype = res_dtype;
         return 0;
     }

Original file line number	Diff line number	Diff line change
`@@ -485,9 +485,11 @@ PyArray_DTypeFromObjectHelper(PyObject *obj, int maxdims,`
`485`	`485`	`/* Set 'out_dtype' if it's NULL */`
`486`	`486`	`if (*out_dtype == NULL) {`
`487`	`487`	`if (!string_type && dtype->type_num == NPY_STRING) {`
	`488`	`+ Py_DECREF(dtype);`
`488`	`489`	`return RETRY_WITH_STRING;`
`489`	`490`	`}`
`490`	`491`	`if (!string_type && dtype->type_num == NPY_UNICODE) {`
	`492`	`+ Py_DECREF(dtype);`
`491`	`493`	`return RETRY_WITH_UNICODE;`
`492`	`494`	`}`
`493`	`495`	`*out_dtype = dtype;`
`@@ -500,17 +502,19 @@ PyArray_DTypeFromObjectHelper(PyObject *obj, int maxdims,`
`500`	`502`	`if (res_dtype == NULL) {`
`501`	`503`	`return -1;`
`502`	`504`	`}`
`503`		`- Py_DECREF(*out_dtype);`
`504`	`505`	`if (!string_type &&`
`505`	`506`	`res_dtype->type_num == NPY_UNICODE &&`
`506`	`507`	`(*out_dtype)->type_num != NPY_UNICODE) {`
	`508`	`+ Py_DECREF(res_dtype);`
`507`	`509`	`return RETRY_WITH_UNICODE;`
`508`	`510`	`}`
`509`	`511`	`if (!string_type &&`
`510`	`512`	`res_dtype->type_num == NPY_STRING &&`
`511`	`513`	`(*out_dtype)->type_num != NPY_STRING) {`
	`514`	`+ Py_DECREF(res_dtype);`
`512`	`515`	`return RETRY_WITH_STRING;`
`513`	`516`	`}`
	`517`	`+ Py_DECREF(*out_dtype);`
`514`	`518`	`*out_dtype = res_dtype;`
`515`	`519`	`return 0;`
`516`	`520`	`}`