<p>Neels Hofmeyr has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12385">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">LOGPFSM*: guard against fi == NULL<br><br>The LOGPFSM macros are in such wide use that they should guard against a NULL<br>fi pointer. In case of NULL, default to subsys = DLGLOBAL, loglevel =<br>LOGL_ERROR and state = "fi=NULL".<br><br>Change-Id: I9eaf8b7e2cf1e450ae626cb2fc928862008f6233<br>---<br>M include/osmocom/core/fsm.h<br>1 file changed, 4 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/85/12385/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/core/fsm.h b/include/osmocom/core/fsm.h</span><br><span>index 0b02e9a..5b43e56 100644</span><br><span>--- a/include/osmocom/core/fsm.h</span><br><span>+++ b/include/osmocom/core/fsm.h</span><br><span>@@ -138,11 +138,11 @@</span><br><span>  * \param args  String format arguments.</span><br><span>  */</span><br><span> #define LOGPFSMLSRC(fi, level, caller_file, caller_line, fmt, args...) \</span><br><span style="color: hsl(0, 100%, 40%);">-          LOGPSRC((fi)->fsm->log_subsys, level, \</span><br><span style="color: hsl(120, 100%, 40%);">+         LOGPSRC((fi) ? (fi)->fsm->log_subsys : DLGLOBAL, level, \</span><br><span>                      caller_file, caller_line, \</span><br><span>                  "%s{%s}: " fmt, \</span><br><span>                  osmo_fsm_inst_name(fi), \</span><br><span style="color: hsl(0, 100%, 40%);">-                       osmo_fsm_state_name((fi)->fsm, (fi)->state), \</span><br><span style="color: hsl(120, 100%, 40%);">+                  (fi) ? osmo_fsm_state_name((fi)->fsm, (fi)->state) : "fi=NULL", \</span><br><span>                    ## args)</span><br><span> </span><br><span> /*! Log using FSM instance's context.</span><br><span>@@ -153,7 +153,7 @@</span><br><span>  * \param args  String format arguments.</span><br><span>  */</span><br><span> #define LOGPFSM(fi, fmt, args...) \</span><br><span style="color: hsl(0, 100%, 40%);">-               LOGPFSML(fi, (fi)->log_level, fmt, ## args)</span><br><span style="color: hsl(120, 100%, 40%);">+                LOGPFSML(fi, (fi) ? (fi)->log_level : LOGL_ERROR, fmt, ## args)</span><br><span> </span><br><span> /*! Log using FSM instance's context, with explicit source file and line info.</span><br><span>  * The log level to log on is obtained from the FSM instance.</span><br><span>@@ -165,7 +165,7 @@</span><br><span>  * \param args  String format arguments.</span><br><span>  */</span><br><span> #define LOGPFSMSRC(fi, caller_file, caller_line, fmt, args...) \</span><br><span style="color: hsl(0, 100%, 40%);">-              LOGPFSMLSRC(fi, (fi)->log_level, \</span><br><span style="color: hsl(120, 100%, 40%);">+         LOGPFSMLSRC(fi, (fi) ? (fi)->log_level : LOGL_ERROR, \</span><br><span>                        caller_file, caller_line, \</span><br><span>                          fmt, ## args)</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12385">change 12385</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/12385"/><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-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I9eaf8b7e2cf1e450ae626cb2fc928862008f6233 </div>
<div style="display:none"> Gerrit-Change-Number: 12385 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>