Add check for float size and fix cppcheck warning in dttsp.c

pull/179/head
Michael Black 2020-01-06 07:49:38 -06:00
rodzic b3a2c02b0c
commit 0341051c80
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 6599353EC683404D
1 zmienionych plików z 7 dodań i 3 usunięć

Wyświetl plik

@ -357,8 +357,8 @@ static int fetch_meter(RIG *rig, int *label, float *data, int npts)
}
/* copy payload back to client space */
memcpy((char *) label, buf, sizeof(int));
memcpy((char *) data, buf + sizeof(int), npts * sizeof(float));
memcpy((void *) label, buf, sizeof(int));
memcpy((void *) data, buf + sizeof(int), npts * sizeof(float));
}
else
@ -378,7 +378,11 @@ static int fetch_meter(RIG *rig, int *label, float *data, int npts)
}
buf_len = sizeof(float) * npts;
ret = read_block(&priv->meter_port, (char *)data, buf_len);
if (sizeof(float)!=4) {
rig_debug(RIG_DEBUG_ERR,"%s: sizeof(float)!=4, instead = %ld\n",__func__, sizeof(float));
return -RIG_EINTERNAL;
}
ret = read_block(&priv->meter_port, (char *)(void*)data, buf_len);
if (ret != buf_len)
{