From f65dfcbbf0e0b2d01fbc8b25228cfe2e92b1a97f Mon Sep 17 00:00:00 2001
From: Michael Fabian 'Xaymar' Dirks <info@xaymar.com>
Date: Wed, 4 Sep 2019 20:43:40 +0200
Subject: [PATCH] filter-blur: Don't throw exceptions into C code

It is extremely problematic to throw C++ exceptions into C code, especially because C code usually does not handle C++ exceptions at all. Therefore we have to prevent any exception from leaving the function and define it as noexcept.
---
 source/filters/filter-blur.cpp | 6 ++++--
 source/filters/filter-blur.hpp | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/source/filters/filter-blur.cpp b/source/filters/filter-blur.cpp
index 97cebf27..47e56e4d 100644
--- a/source/filters/filter-blur.cpp
+++ b/source/filters/filter-blur.cpp
@@ -393,8 +393,7 @@ bool filter::blur::blur_instance::apply_mask_parameters(std::shared_ptr<gs::effe
 }
 
 bool filter::blur::blur_instance::modified_properties(void*, obs_properties_t* props, obs_property* prop,
-													  obs_data_t* settings)
-{
+													  obs_data_t* settings) noexcept try {
 	obs_property_t* p;
 	const char*     propname = obs_property_name(prop);
 	const char*     vtype    = obs_data_get_string(settings, ST_TYPE);
@@ -552,6 +551,9 @@ bool filter::blur::blur_instance::modified_properties(void*, obs_properties_t* p
 	}
 
 	return true;
+} catch (...) {
+	P_LOG_ERROR("Unexpected exception in modified_properties callback.");
+	return false;
 }
 
 void filter::blur::blur_instance::translate_old_settings(obs_data_t* settings)
diff --git a/source/filters/filter-blur.hpp b/source/filters/filter-blur.hpp
index aa9fd137..1b714d27 100644
--- a/source/filters/filter-blur.hpp
+++ b/source/filters/filter-blur.hpp
@@ -161,7 +161,7 @@ namespace filter {
 									   gs_texture_t* blurred_texture);
 
 			static bool modified_properties(void* ptr, obs_properties_t* props, obs_property* prop,
-											obs_data_t* settings);
+											obs_data_t* settings) noexcept;
 
 			void translate_old_settings(obs_data_t*);