missed a few

CMB-S4 · Aug 24, 2024 · b4bc52d · b4bc52d
1 parent 88a0a05
commit b4bc52d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/core/include/core/container_conversions.h b/core/include/core/container_conversions.h
@@ -243,6 +243,10 @@ namespace scitbx { namespace boost_python { namespace container_conversions {
         if (!py_elem_hdl.get()) break; // end of iteration
         boost::python::object py_elem_obj(py_elem_hdl);
         boost::python::extract<container_element_type> elem_proxy(py_elem_obj);
+        if (!elem_proxy.check()) {
+          PyErr_SetString(PyExc_RuntimeError, "Invalid element");
+          boost::python::throw_error_already_set();
+        }
         ConversionPolicy::set_value(result, i, elem_proxy());
       }
       ConversionPolicy::assert_size(boost::type<ContainerType>(), i);

diff --git a/maps/src/FlatSkyMap.cxx b/maps/src/FlatSkyMap.cxx
@@ -1032,11 +1032,16 @@ flatskymap_setitem_2d(FlatSkyMap &skymap, bp::tuple coords,
 
 	FlatSkyMapPtr shallowclone =
 	    boost::dynamic_pointer_cast<FlatSkyMap>(skymap.Clone(false));
-	FlatSkyMapPtr dummy_subpatch = bp::extract<FlatSkyMapPtr>(
-	    flatskymap_getitem_2d(*shallowclone, coords));
+	bp::extract<FlatSkyMapPtr> dummyext(flatskymap_getitem_2d(*shallowclone, coords));
+	if (!dummyext.check()) {
+		PyErr_SetString(PyExc_ValueError, "Invalid patch");
+		bp::throw_error_already_set();
+	}
+	FlatSkyMapPtr dummy_subpatch = dummyext();
 
-	if (bp::extract<FlatSkyMap>(val).check()) {
-		const FlatSkyMap &patch = bp::extract<FlatSkyMap>(val)();
+	bp::extract<const FlatSkyMap &> mapext(val);
+	if (mapext.check()) {
+		const FlatSkyMap &patch = mapext();
 		if (!dummy_subpatch->IsCompatible(patch)) {
 			PyErr_SetString(PyExc_ValueError, "Provided patch to insert is "
 			    "not compatible with the given subregion of the map into "

diff --git a/maps/src/maputils.cxx b/maps/src/maputils.cxx
@@ -502,8 +502,9 @@ pyconvolve_map(FlatSkyMapConstPtr map, bp::object val)
 {
 
 	FlatSkyMapConstPtr kernel;
-	if (bp::extract<FlatSkyMap>(val).check())
-		kernel = bp::extract<FlatSkyMapConstPtr>(val)();
+	bp::extract<FlatSkyMapConstPtr> ext(val);
+	if (ext.check())
+		kernel = ext();
 	else
 		kernel = FlatSkyMapConstPtr(new FlatSkyMap(val, map->yres()));
 	return ConvolveMap(map, kernel);