folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ETHER: Silence several Coverity warnings.

Browse source 
Most were noise and non-issues, but the change from fclose() to
pclose() was absolutely needed.

A false positive remains regarding tun variable going out of scope.
Under the conditions where a resource leak could occur, the tun
variable is saved in *fd_handle and thus not leaked.
This commit is contained in:
Mark Pizzolato 2020-08-08 17:52:04 -07:00
parent 4810b950d2
commit 5e46b298f1
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sim_ether.c
View file

@ -1687,7 +1687,7 @@ if (f) {
read_size = fread (buf, 1, buf_size - 1, f); read_size = fread (buf, 1, buf_size - 1, f);
buf[read_size] = '\0'; buf[read_size] = '\0';
fclose (f); pclose (f);
} }
while ((strlen (buf) > 0) && sim_isspace(buf[strlen (buf) - 1])) while ((strlen (buf) > 0) && sim_isspace(buf[strlen (buf) - 1]))
buf[strlen (buf) - 1] = '\0'; buf[strlen (buf) - 1] = '\0';
@ -3440,7 +3440,7 @@ response.msg[15] = (offset >> 8) & 0xFF;
/* send response packet */ /* send response packet */
eth_write(dev, &response, NULL); eth_write(dev, &response, NULL);
eth_packet_trace(dev, response.msg, response.len, ((function == 1) ? "loopbackreply" : "loopbackforward")); eth_packet_trace(dev, response.msg, response.len, "loopbackforward");
++dev->loopback_packets_processed; ++dev->loopback_packets_processed;
@ -3887,6 +3887,9 @@ if (dev->dptr->dctrl & dev->dbit) {
sim_debug(dev->dbit, dev->dptr, "Promiscuous\n"); sim_debug(dev->dbit, dev->dptr, "Promiscuous\n");
} }
} }
#ifdef USE_READER_THREAD
pthread_mutex_lock (&dev->self_lock);
#endif
/* Set the desired physical address */ /* Set the desired physical address */
memset(dev->physical_addr, 0, sizeof(ETH_MAC)); memset(dev->physical_addr, 0, sizeof(ETH_MAC));
dev->loopback_self_sent = 0; dev->loopback_self_sent = 0;
@ -3900,6 +3903,9 @@ for (i = 0; i < addr_count; i++) {
break; break;
} }
} }
#ifdef USE_READER_THREAD
pthread_mutex_unlock (&dev->self_lock);
#endif
/* setup BPF filters and other fields to minimize packet delivery */ /* setup BPF filters and other fields to minimize packet delivery */
eth_bpf_filter (dev, dev->addr_count, dev->filter_address, eth_bpf_filter (dev, dev->addr_count, dev->filter_address,