mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Allow one extra byte in read_string() length to accomodate terminator 

The kenwood_transaction()  function expects a buffer  large enough for
the  null  terminated  command   response  less  the  Kenwood  command
terminator (';') but  the read_string() call must allow  an extra byte
for that same terminator.
Hamlib-3.0
Bill Somerville 2015-03-06 19:48:47 +00:00
rodzic 72f1e92be3
commit 3d99e9dbb6
1 zmienionych plików z 3 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
kenwood/kenwood.c
Wyświetl plik

@ -181,7 +181,7 @@ const struct confparams kenwood_cfg_params[] = {
* indicating that only a reply is needed (nothing will be sent). * indicating that only a reply is needed (nothing will be sent).
* data: Buffer for reply string. Can be NULL, indicating that no reply * data: Buffer for reply string. Can be NULL, indicating that no reply
* is needed and will return with RIG_OK after command was sent. * is needed and will return with RIG_OK after command was sent.
* datasize: in: Size of buffer. It is the caller's responsibily to provide * datasize: Size of buffer. It is the caller's responsibily to provide
* a large enough buffer for all possible replies for a command. * a large enough buffer for all possible replies for a command.
* *
* returns: * returns:
@ -264,7 +264,8 @@ int kenwood_transaction(RIG *rig, const char *cmdstr, char *data, size_t datasiz
} }
} }
len = min (datasize ? datasize : strlen (verify) + 7, KENWOOD_MAX_BUF_LEN); /* allow one extra byte for terminator we don't return */
len = min (datasize ? datasize + 1 : strlen (verify) + 7, KENWOOD_MAX_BUF_LEN);
retval = read_string(&rs->rigport, buffer, len, cmdtrm, strlen(cmdtrm)); retval = read_string(&rs->rigport, buffer, len, cmdtrm, strlen(cmdtrm));
if (retval < 0) { if (retval < 0) {
if (retry_read++ < rig->caps->retry) if (retry_read++ < rig->caps->retry)