added self state subscription validation

kmilo17pet · Nov 24, 2023 · 677eaf1 · 677eaf1
1 parent 4cfcd25
commit 677eaf1
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/src/fsm.cpp b/src/fsm.cpp
@@ -184,16 +184,20 @@ void sm::state::topSelf( const sm::stateCallback_t topFcn, sm::state *init ) noe
 /*============================================================================*/
 bool sm::state::subscribe( sm::state *s, const sm::stateCallback_t sFcn, sm::state *init ) noexcept
 {
-    s->lastRunningChild = init;
-    s->initState = init;
-    s->sCallback = sFcn;
-    s->parent = this;
-    s->tTable = nullptr;
-    s->tEntries = 0U;
-    s->tdef = nullptr;
-    s->nTm = 0U;
-
-    return true;
+    int retValue = false;
+
+    if ( ( s != this ) && ( init != this ) ) {
+        s->lastRunningChild = init;
+        s->initState = init;
+        s->sCallback = sFcn;
+        s->parent = this;
+        s->tTable = nullptr;
+        s->tEntries = 0U;
+        s->tdef = nullptr;
+        s->nTm = 0U;
+        retValue = true;
+    }
+    return retValue;
 }
 /*============================================================================*/
 bool sm::state::setTransitions( sm::transition_t *table, size_t n ) noexcept