From 89b49e2afaed572697a6311a41b9dbabbf191013 Mon Sep 17 00:00:00 2001 From: Larry Gritz Date: Wed, 21 Aug 2024 00:31:46 -0700 Subject: [PATCH] fix: Catch potential OCIO exception that we were missing (#4379) Signed-off-by: Larry Gritz --- src/libOpenImageIO/color_ocio.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/libOpenImageIO/color_ocio.cpp b/src/libOpenImageIO/color_ocio.cpp index 76ed1d9daa..c2e02c1e9c 100644 --- a/src/libOpenImageIO/color_ocio.cpp +++ b/src/libOpenImageIO/color_ocio.cpp @@ -1074,10 +1074,15 @@ ColorConfig::Impl::isColorSpaceLinear(string_view name) const { #if OCIO_VERSION_HEX >= MAKE_OCIO_VERSION_HEX(2, 2, 0) if (config_ && !disable_builtin_configs && !disable_ocio) { - return config_->isColorSpaceLinear(c_str(name), - OCIO::REFERENCE_SPACE_SCENE) - || config_->isColorSpaceLinear(c_str(name), - OCIO::REFERENCE_SPACE_DISPLAY); + try { + return config_->isColorSpaceLinear(c_str(name), + OCIO::REFERENCE_SPACE_SCENE) + || config_->isColorSpaceLinear(c_str(name), + OCIO::REFERENCE_SPACE_DISPLAY); + } catch (const std::exception& e) { + error("ColorConfig error: {}", e.what()); + return false; + } } #endif return Strutil::iequals(name, "linear")