Don't force queueCallback with no parameter

Sanitizer reports undefined behaviour passing parameter to function which doesn't expect one. Works fine in practice but safer to add a lamba for dealing with it.
SmingHub · Jun 28, 2024 · cbb1781 · cbb1781
1 parent e16b785
commit cbb1781
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/Sming/Platform/System.cpp b/Sming/Platform/System.cpp
@@ -93,6 +93,12 @@ bool SystemClass::queueCallback(TaskCallback callback, void* param)
 						  reinterpret_cast<os_param_t>(param));
 }
 
+bool SystemClass::queueCallback(InterruptCallback callback)
+{
+	return queueCallback([](void* param) { reinterpret_cast<InterruptCallback>(param)(); },
+						 reinterpret_cast<void*>(callback));
+}
+
 bool SystemClass::queueCallback(TaskDelegate callback)
 {
 	if(!callback) {

diff --git a/Sming/Platform/System.h b/Sming/Platform/System.h
@@ -204,10 +204,7 @@ class SystemClass
 	/**
 	 * @brief Queue a deferred callback with no callback parameter
 	 */
-	__forceinline static bool IRAM_ATTR queueCallback(InterruptCallback callback)
-	{
-		return queueCallback(reinterpret_cast<TaskCallback>(callback));
-	}
+	static bool IRAM_ATTR queueCallback(InterruptCallback callback);
 
 	/**
 	 * @brief Queue a deferred Delegate callback