Merge pull request #7308 from madphysicist/madphysicist-pyref-bug

seberg · seberg · commit 4b78b9025f54 · 2016-02-23T17:26:58.000+01:00
BUG: Incrementing the wrong reference on return
diff --git a/numpy/core/src/umath/funcs.inc.src b/numpy/core/src/umath/funcs.inc.src
@@ -89,7 +89,7 @@ npy_ObjectLogicalOr(PyObject *i1, PyObject *i2)
         return i2;
     }
     else if (i2 == NULL) {
-        Py_INCREF(i2);
+        Py_INCREF(i1);
         return i1;
     }
     else {

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ npy_ObjectLogicalOr(PyObject i1, PyObject i2)`
`89`	`89`	`return i2;`
`90`	`90`	`}`
`91`	`91`	`else if (i2 == NULL) {`
`92`		`- Py_INCREF(i2);`
	`92`	`+ Py_INCREF(i1);`
`93`	`93`	`return i1;`
`94`	`94`	`}`
`95`	`95`	`else {`