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

ETHER: Silence Coverity indicated potential issues

Browse source
This commit is contained in:
Mark Pizzolato 2020-03-07 22:36:24 -08:00
parent 7d079990df
commit de335bfd6a
1 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
sim_ether.c
View file

@ -1653,7 +1653,9 @@ static int _eth_get_system_id (char *buf, size_t buf_size)
#endif #endif
if ((status = RegOpenKeyExA (HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Cryptography", 0, KEY_QUERY_VALUE|KEY_WOW64_64KEY, &reghnd)) != ERROR_SUCCESS) if ((status = RegOpenKeyExA (HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Cryptography", 0, KEY_QUERY_VALUE|KEY_WOW64_64KEY, &reghnd)) != ERROR_SUCCESS)
return -1; return -1;
reglen = buf_size; if (buf_size < 37)
return -1;
reglen = buf_size - 1;
if ((status = RegQueryValueExA (reghnd, "MachineGuid", NULL, &regtype, (LPBYTE)buf, &reglen)) != ERROR_SUCCESS) { if ((status = RegQueryValueExA (reghnd, "MachineGuid", NULL, &regtype, (LPBYTE)buf, &reglen)) != ERROR_SUCCESS) {
RegCloseKey (reghnd); RegCloseKey (reghnd);
return -1; return -1;
@ -1672,19 +1674,16 @@ static int _eth_get_system_id (char *buf, size_t buf_size)
FILE *f; FILE *f;
memset (buf, 0, buf_size); memset (buf, 0, buf_size);
if ((f = fopen ("/etc/machine-id", "r"))) { if (buf_size < 37)
if (fread (buf, 1, buf_size - 1, f)) return -1;
fclose (f); if ((f = fopen ("/etc/machine-id", "r")) == NULL)
else f = popen ("hostname", "r");
fclose (f); if (f) {
} size_t read_size;
else {
if ((f = popen ("hostname", "r"))) { read_size = fread (buf, 1, buf_size - 1, f);
if (fread (buf, 1, buf_size - 1, f)) buf[read_size] = '\0';
pclose (f); fclose (f);
else
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';
@ -2073,7 +2072,7 @@ if (0 == strncmp("tap:", savname, 4)) {
strcpy(savname, devname); strcpy(savname, devname);
} }
#if defined (__APPLE__) #if defined (__APPLE__)
if (1) { if (tun < 0) { /* Not good yet? */
struct ifreq ifr; struct ifreq ifr;
int s; int s;