Fix ub in any (#777)

* Fixed undefined behavior in Any::operator==(value) * Revert "Fixed undefined behavior in Any::operator==(value)" This reverts commit 3066fe1. * Fixed undefined behavior in Any::operator==(value) * removed unnecessary forward declaration. * Fixed undefined behavior in Any::operator==(value) * removed unnecessary forward declaration.
CppMicroServices · Jan 26, 2023 · 7cbb41c · 7cbb41c
1 parent bb43780
commit 7cbb41c
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/framework/include/cppmicroservices/Any.h b/framework/include/cppmicroservices/Any.h
@@ -137,7 +137,10 @@ namespace cppmicroservices
     }
 
     template <typename ValueType>
-    ValueType* any_cast(Any* operand);
+    ValueType& ref_any_cast(Any& operand);
+
+    template <typename ValueType>
+    ValueType const& ref_any_cast(Any const& operand);
 
     template <class T>
     std::ostream&
@@ -340,7 +343,8 @@ namespace cppmicroservices
         {
             if (Type() != typeid(ValueType))
                 return false;
-            return cppmicroservices::any::detail::compare(*any_cast<ValueType const>(this), val);
+            ValueType const& my_val = cppmicroservices::ref_any_cast<ValueType>(*this);
+            return cppmicroservices::any::detail::compare(my_val, val);
         }
 
         /**