Merge pull request #209 from ankane/bad-any-cast3

Improve exception handling for bad any cast
ruby-rice · Oct 13, 2024 · 84e4071 · 84e4071
2 parents a82515b + 52bfddb
commit 84e4071
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/include/rice/rice.hpp b/include/rice/rice.hpp
@@ -1169,7 +1169,12 @@ namespace Rice::detail
 
       if (k == klass && m == method_id)
       {
-        return std::any_cast<Return_T>(d);
+        auto* ptr = std::any_cast<Return_T>(&d);
+        if (!ptr)
+        {
+          rb_raise(rb_eRuntimeError, "Unexpected return type for %s#%s", rb_class2name(klass), rb_id2name(method_id));
+        }
+        return *ptr;
       }
     }
 

diff --git a/rice/detail/NativeRegistry.ipp b/rice/detail/NativeRegistry.ipp
@@ -68,7 +68,12 @@ namespace Rice::detail
 
       if (k == klass && m == method_id)
       {
-        return std::any_cast<Return_T>(d);
+        auto* ptr = std::any_cast<Return_T>(&d);
+        if (!ptr)
+        {
+          rb_raise(rb_eRuntimeError, "Unexpected return type for %s#%s", rb_class2name(klass), rb_id2name(method_id));
+        }
+        return *ptr;
       }
     }