<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/24948">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Make gcc 11.1.0 false positivies happy<br><br>After my system's gcc was upgraded, I get false positivies in a couple<br>places. Let's initialize those to make gcc happy.<br><br>"""<br>/git/libosmocore/src/socket.c: In function ‘osmo_sock_init’:<br>/git/libosmocore/src/socket.c:958:25: error: ‘sfd’ may be used uninitialized in this function [-Werror=maybe-uninitialized]<br> 958 | close(sfd);<br> | ^~~~~~~~~~<br><br>/git/libosmocore/src/gsm/gsm48.c: In function ‘osmo_mobile_identity_decode’:<br>/git/libosmocore/src/gsm/gsm48.c:690:20: error: ‘str_size’ may be used uninitialized in this function [-Werror=maybe-uninitialized]<br> 690 | if (rc < 1 || rc >= str_size) {<br> | ~~~~~~~^~~~~~~~~~~~~~~~~<br>/git/libosmocore/src/gsm/gsm48.c:679:22: error: ‘str’ may be used uninitialized in this function [-Werror=maybe-uninitialized]<br> 679 | rc = osmo_bcd2str(str, str_size, mi_data, 1, 1 + nibbles_len, allow_hex);<br> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~<br>"""<br><br>Change-Id: I8aacfbc21e23f63a65e8baee3fd536a1fe1bdd8a<br>---<br>M src/gsm/gsm48.c<br>M src/socket.c<br>2 files changed, 11 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/48/24948/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c</span><br><span>index ae1a21b..44ce776 100644</span><br><span>--- a/src/gsm/gsm48.c</span><br><span>+++ b/src/gsm/gsm48.c</span><br><span>@@ -601,8 +601,8 @@</span><br><span> {</span><br><span> int rc;</span><br><span> int nibbles_len;</span><br><span style="color: hsl(0, 100%, 40%);">- char *str;</span><br><span style="color: hsl(0, 100%, 40%);">- size_t str_size;</span><br><span style="color: hsl(120, 100%, 40%);">+ char *str = NULL; /* initialize to avoid uninitialized false warnings on some gcc versions (11.1.0) */</span><br><span style="color: hsl(120, 100%, 40%);">+ size_t str_size = 0; /* initialize to avoid uninitialized false warnings on some gcc versions (11.1.0) */</span><br><span> </span><br><span> if (!mi_data || mi_len < 1)</span><br><span> return -EBADMSG;</span><br><span>@@ -677,8 +677,12 @@</span><br><span> goto return_error;</span><br><span> }</span><br><span> rc = osmo_bcd2str(str, str_size, mi_data, 1, 1 + nibbles_len, allow_hex);</span><br><span style="color: hsl(0, 100%, 40%);">- /* rc checked below */</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* check mi->str printing rc */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 1 || rc >= str_size) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = -EBADMSG;</span><br><span style="color: hsl(120, 100%, 40%);">+ goto return_error;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span> </span><br><span> default:</span><br><span> /* Already handled above, but as future bug paranoia: */</span><br><span>@@ -686,13 +690,6 @@</span><br><span> goto return_error;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* check mi->str printing rc */</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc < 1 || rc >= str_size) {</span><br><span style="color: hsl(0, 100%, 40%);">- rc = -EBADMSG;</span><br><span style="color: hsl(0, 100%, 40%);">- goto return_error;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> return_error:</span><br><span> *mi = (struct osmo_mobile_identity){</span><br><span> .type = GSM_MI_TYPE_NONE,</span><br><span>diff --git a/src/socket.c b/src/socket.c</span><br><span>index 34972b8..19d48e4 100644</span><br><span>--- a/src/socket.c</span><br><span>+++ b/src/socket.c</span><br><span>@@ -894,7 +894,9 @@</span><br><span> const char *host, uint16_t port, unsigned int flags)</span><br><span> {</span><br><span> struct addrinfo *result, *rp;</span><br><span style="color: hsl(0, 100%, 40%);">- int sfd, rc, on = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ int sfd = -1; /* initialize to avoid uninitialized false warnings on some gcc versions (11.1.0) */</span><br><span style="color: hsl(120, 100%, 40%);">+ int on = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span> </span><br><span> if ((flags & (OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT)) ==</span><br><span> (OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT)) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/24948">change 24948</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/+/24948"/><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: I8aacfbc21e23f63a65e8baee3fd536a1fe1bdd8a </div>
<div style="display:none"> Gerrit-Change-Number: 24948 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>