<p>Stefan Sperling <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11943">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Max: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">fix file descriptor leak in osysmon_file_read<br><br>Don't forget to close the file which was opened at the<br>beginning of this function's scope. Found by Coverity.<br><br>Change-Id: Ie1b5734748438c6d785cd96dfa9af6303cd102da<br>Related: CID#189756<br>---<br>M osysmon_file.c<br>1 file changed, 4 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/osysmon_file.c b/osysmon_file.c</span><br><span>index 6f826b4..3a228fa 100644</span><br><span>--- a/osysmon_file.c</span><br><span>+++ b/osysmon_file.c</span><br><span>@@ -77,7 +77,7 @@</span><br><span> static void osysmon_file_read(struct osysmon_file *of, struct value_node *parent)</span><br><span> {</span><br><span>     char buf[512];</span><br><span style="color: hsl(0, 100%, 40%);">-  char *nl;</span><br><span style="color: hsl(120, 100%, 40%);">+     char *s, *nl;</span><br><span>        FILE *f;</span><br><span> </span><br><span>         f = fopen(of->cfg.path, "r");</span><br><span>@@ -85,7 +85,9 @@</span><br><span>               value_node_add(parent, parent, of->cfg.name, "<NOTFOUND>");</span><br><span>               return;</span><br><span>      }</span><br><span style="color: hsl(0, 100%, 40%);">-       if (fgets(buf, sizeof(buf), f) == NULL) {</span><br><span style="color: hsl(120, 100%, 40%);">+     s = fgets(buf, sizeof(buf), f);</span><br><span style="color: hsl(120, 100%, 40%);">+       fclose(f);</span><br><span style="color: hsl(120, 100%, 40%);">+    if (s == NULL) {</span><br><span>             value_node_add(parent, parent, of->cfg.name, "<EMPTY>");</span><br><span>          return;</span><br><span>      }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11943">change 11943</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/11943"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-sysmon </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ie1b5734748438c6d785cd96dfa9af6303cd102da </div>
<div style="display:none"> Gerrit-Change-Number: 11943 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Stefan Sperling <ssperling@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Stefan Sperling <ssperling@sysmocom.de> </div>