Merge pull request #25850 from anntzer/exc

ksunden · web-flow · commit f394597f687a · 2023-06-02T23:08:49.000-05:00
Handle exceptions in numpy::array_view&lt;...&gt;::set().
diff --git a/src/py_converters.cpp b/src/py_converters.cpp
@@ -510,8 +510,8 @@ int convert_points(PyObject *obj, void *pointsp)
     if (obj == NULL || obj == Py_None) {
         return 1;
     }
-    points->set(obj);
-    if (points->size() && !check_trailing_shape(*points, "points", 2)) {
+    if (!points->set(obj)
+        || points->size() && !check_trailing_shape(*points, "points", 2)) {
         return 0;
     }
     return 1;
@@ -523,8 +523,8 @@ int convert_transforms(PyObject *obj, void *transp)
     if (obj == NULL || obj == Py_None) {
         return 1;
     }
-    trans->set(obj);
-    if (trans->size() && !check_trailing_shape(*trans, "transforms", 3, 3)) {
+    if (!trans->set(obj)
+        || trans->size() && !check_trailing_shape(*trans, "transforms", 3, 3)) {
         return 0;
     }
     return 1;
@@ -536,8 +536,8 @@ int convert_bboxes(PyObject *obj, void *bboxp)
     if (obj == NULL || obj == Py_None) {
         return 1;
     }
-    bbox->set(obj);
-    if (bbox->size() && !check_trailing_shape(*bbox, "bbox array", 2, 2)) {
+    if (!bbox->set(obj)
+        || bbox->size() && !check_trailing_shape(*bbox, "bbox array", 2, 2)) {
         return 0;
     }
     return 1;
@@ -549,8 +549,8 @@ int convert_colors(PyObject *obj, void *colorsp)
     if (obj == NULL || obj == Py_None) {
         return 1;
     }
-    colors->set(obj);
-    if (colors->size() && !check_trailing_shape(*colors, "colors", 4)) {
+    if (!colors->set(obj)
+        || colors->size() && !check_trailing_shape(*colors, "colors", 4)) {
         return 0;
     }
     return 1;

Original file line number	Diff line number	Diff line change
`@@ -510,8 +510,8 @@ int convert_points(PyObject obj, void pointsp)`
`510`	`510`	`if (obj == NULL \|\| obj == Py_None) {`
`511`	`511`	`return 1;`
`512`	`512`	`}`
`513`		`- points->set(obj);`
`514`		`- if (points->size() && !check_trailing_shape(*points, "points", 2)) {`
	`513`	`+ if (!points->set(obj)`
	`514`	`+ \|\| points->size() && !check_trailing_shape(*points, "points", 2)) {`
`515`	`515`	`return 0;`
`516`	`516`	`}`
`517`	`517`	`return 1;`
`@@ -523,8 +523,8 @@ int convert_transforms(PyObject obj, void transp)`
`523`	`523`	`if (obj == NULL \|\| obj == Py_None) {`
`524`	`524`	`return 1;`
`525`	`525`	`}`
`526`		`- trans->set(obj);`
`527`		`- if (trans->size() && !check_trailing_shape(*trans, "transforms", 3, 3)) {`
	`526`	`+ if (!trans->set(obj)`
	`527`	`+ \|\| trans->size() && !check_trailing_shape(*trans, "transforms", 3, 3)) {`
`528`	`528`	`return 0;`
`529`	`529`	`}`
`530`	`530`	`return 1;`
`@@ -536,8 +536,8 @@ int convert_bboxes(PyObject obj, void bboxp)`
`536`	`536`	`if (obj == NULL \|\| obj == Py_None) {`
`537`	`537`	`return 1;`
`538`	`538`	`}`
`539`		`- bbox->set(obj);`
`540`		`- if (bbox->size() && !check_trailing_shape(*bbox, "bbox array", 2, 2)) {`
	`539`	`+ if (!bbox->set(obj)`
	`540`	`+ \|\| bbox->size() && !check_trailing_shape(*bbox, "bbox array", 2, 2)) {`
`541`	`541`	`return 0;`
`542`	`542`	`}`
`543`	`543`	`return 1;`
`@@ -549,8 +549,8 @@ int convert_colors(PyObject obj, void colorsp)`
`549`	`549`	`if (obj == NULL \|\| obj == Py_None) {`
`550`	`550`	`return 1;`
`551`	`551`	`}`
`552`		`- colors->set(obj);`
`553`		`- if (colors->size() && !check_trailing_shape(*colors, "colors", 4)) {`
	`552`	`+ if (!colors->set(obj)`
	`553`	`+ \|\| colors->size() && !check_trailing_shape(*colors, "colors", 4)) {`
`554`	`554`	`return 0;`
`555`	`555`	`}`
`556`	`556`	`return 1;`