uORBManager.hpp: Check handle validity in queue/dequeueCallback

tiiuae · Oct 9, 2023 · ed48854 · ed48854
1 parent 4c22f26
commit ed48854
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/platforms/common/uORB/uORBManager.hpp b/platforms/common/uORB/uORBManager.hpp
@@ -446,15 +446,22 @@ class Manager
 
 	static void queueCallback(class SubscriptionCallback *sub, int idx)
 	{
-		_Instance->g_sem_pool.cb_lock(idx);
-		_Instance->g_sem_pool.cb_set(idx, sub);
-		// The manager is unlocked in callback thread
+		if (idx >= 0) {
+			_Instance->g_sem_pool.cb_lock(idx);
+			_Instance->g_sem_pool.cb_set(idx, sub);
+			// The manager is unlocked in callback thread
+		}
 	}
 
 	static class SubscriptionCallback *dequeueCallback(int idx)
 	{
-		class SubscriptionCallback *sub = _Instance->g_sem_pool.cb_get(idx);
-		_Instance->g_sem_pool.cb_unlock(idx);
+		class SubscriptionCallback *sub = nullptr;
+
+		if (idx >= 0) {
+			sub = _Instance->g_sem_pool.cb_get(idx);
+			_Instance->g_sem_pool.cb_unlock(idx);
+		}
+
 		return sub;
 	}