<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/16355">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo_fsm: Esnure all state and event names are valid identifiers<br><br>we call osmo_identifier_valid() for the FSM name and FSM instance, but we<br>forgot to do so for all the state and event names. This meant that they<br>could contain spaces and the like, which in turn might create problems<br>when exposing FSM state over CTRL.<br><br>This patch shouldn't be merged as-is right now. We first have to<br>use it to determine which of our existing programs have related issues.<br><br>Change-Id: If98587eff3c48a66ed2e5cc1f01a12accab5a3e7<br>Closes: OS#4149<br>---<br>M src/fsm.c<br>1 file changed, 29 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/55/16355/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/fsm.c b/src/fsm.c</span><br><span>index 1e8909e..2f270cb 100644</span><br><span>--- a/src/fsm.c</span><br><span>+++ b/src/fsm.c</span><br><span>@@ -286,10 +286,38 @@</span><br><span> */</span><br><span> int osmo_fsm_register(struct osmo_fsm *fsm)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int i;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool err = false;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* first collect all errors regarding identifiers (not just the first one) */</span><br><span> if (!osmo_identifier_valid(fsm->name)) {</span><br><span> LOGP(DLGLOBAL, LOGL_ERROR, "Attempting to register FSM with illegal identifier '%s'\n", fsm->name);</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+ err = true;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < fsm->num_states; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_fsm_state *states = fsm->states;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!osmo_identifier_valid(states[i].name)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGLOBAL, LOGL_ERROR, "Attempting to register FSM with illegal "</span><br><span style="color: hsl(120, 100%, 40%);">+ "state name '%s'\n", states[i].name);</span><br><span style="color: hsl(120, 100%, 40%);">+ err = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (fsm->event_names) {</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct value_string *vs = fsm->event_names;</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0;; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (vs[i].value == 0 && vs[i].str == NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!osmo_identifier_valid(vs[i].str)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGLOBAL, LOGL_ERROR, "Attempting to register FSM with illegal"</span><br><span style="color: hsl(120, 100%, 40%);">+ "event name '%s'\n", vs[i].str);</span><br><span style="color: hsl(120, 100%, 40%);">+ err = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ /* then return -EINVAL in case any identifier error[s] were encountered */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (err)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (osmo_fsm_find_by_name(fsm->name))</span><br><span> return -EEXIST;</span><br><span> if (fsm->event_names == NULL)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/16355">change 16355</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/libosmocore/+/16355"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: If98587eff3c48a66ed2e5cc1f01a12accab5a3e7 </div>
<div style="display:none"> Gerrit-Change-Number: 16355 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>