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

Change sprintf to snprint in amp_conf.c 

https://github.com/Hamlib/Hamlib/issues/857
pull/928/head
Mike Black W9MDB 2022-01-09 17:46:07 -06:00
rodzic fdae4f6aa5
commit 18ca415b41
2 zmienionych plików z 19 dodań i 15 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

32
src/amp_conf.c
Wyświetl plik

@ -327,7 +327,7 @@ int frontamp_set_conf(AMP *amp, token_t token, const char *val)
* *
* \sa frontamp_set_conf() * \sa frontamp_set_conf()
*/ */
int frontamp_get_conf(AMP *amp, token_t token, char *val) int frontamp_get_conf2(AMP *amp, token_t token, char *val, int val_len)
{ {
struct amp_state *rs; struct amp_state *rs;
const char *s; const char *s;
@ -339,23 +339,23 @@ int frontamp_get_conf(AMP *amp, token_t token, char *val)
switch (token) switch (token)
{ {
case TOK_PATHNAME: case TOK_PATHNAME:
strcpy(val, rs->ampport.pathname); strncpy(val, rs->ampport.pathname, val_len-1);
break; break;
case TOK_WRITE_DELAY: case TOK_WRITE_DELAY:
sprintf(val, "%d", rs->ampport.write_delay); snprintf(val, val_len, "%d", rs->ampport.write_delay);
break; break;
case TOK_POST_WRITE_DELAY: case TOK_POST_WRITE_DELAY:
sprintf(val, "%d", rs->ampport.post_write_delay); snprintf(val, val_len, "%d", rs->ampport.post_write_delay);
break; break;
case TOK_TIMEOUT: case TOK_TIMEOUT:
sprintf(val, "%d", rs->ampport.timeout); snprintf(val, val_len, "%d", rs->ampport.timeout);
break; break;
case TOK_RETRY: case TOK_RETRY:
sprintf(val, "%d", rs->ampport.retry); snprintf(val, val_len, "%d", rs->ampport.retry);
break; break;
case TOK_SERIAL_SPEED: case TOK_SERIAL_SPEED:
@ -364,7 +364,7 @@ int frontamp_get_conf(AMP *amp, token_t token, char *val)
return -RIG_EINVAL; return -RIG_EINVAL;
} }
sprintf(val, "%d", rs->ampport.parm.serial.rate); snprintf(val, val_len, "%d", rs->ampport.parm.serial.rate);
break; break;
case TOK_DATA_BITS: case TOK_DATA_BITS:
@ -373,7 +373,7 @@ int frontamp_get_conf(AMP *amp, token_t token, char *val)
return -RIG_EINVAL; return -RIG_EINVAL;
} }
sprintf(val, "%d", rs->ampport.parm.serial.data_bits); snprintf(val, val_len, "%d", rs->ampport.parm.serial.data_bits);
break; break;
case TOK_STOP_BITS: case TOK_STOP_BITS:
@ -382,7 +382,7 @@ int frontamp_get_conf(AMP *amp, token_t token, char *val)
return -RIG_EINVAL; return -RIG_EINVAL;
} }
sprintf(val, "%d", rs->ampport.parm.serial.stop_bits); snprintf(val, val_len, "%d", rs->ampport.parm.serial.stop_bits);
break; break;
case TOK_PARITY: case TOK_PARITY:
@ -417,7 +417,7 @@ int frontamp_get_conf(AMP *amp, token_t token, char *val)
return -RIG_EINVAL; return -RIG_EINVAL;
} }
strcpy(val, s); strncpy(val, s, val_len-1);
break; break;
case TOK_HANDSHAKE: case TOK_HANDSHAKE:
@ -444,7 +444,7 @@ int frontamp_get_conf(AMP *amp, token_t token, char *val)
return -RIG_EINVAL; return -RIG_EINVAL;
} }
strcpy(val, s); strncpy(val, s, val_len);
break; break;
default: default:
@ -654,7 +654,7 @@ int HAMLIB_API amp_set_conf(AMP *amp, token_t token, const char *val)
{ {
const struct confparams *cfp; const struct confparams *cfp;
char tokenstr[12]; char tokenstr[12];
sprintf(tokenstr, "%ld", token); snprintf(tokenstr, sizeof(tokenstr), "%ld", token);
cfp = amp_confparam_lookup(amp, tokenstr); cfp = amp_confparam_lookup(amp, tokenstr);
if (!cfp) if (!cfp)
@ -697,7 +697,7 @@ int HAMLIB_API amp_set_conf(AMP *amp, token_t token, const char *val)
* *
* \sa amp_set_conf() * \sa amp_set_conf()
*/ */
int HAMLIB_API amp_get_conf(AMP *amp, token_t token, char *val) int HAMLIB_API amp_get_conf2(AMP *amp, token_t token, char *val, int val_len)
{ {
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__); rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
@ -708,7 +708,7 @@ int HAMLIB_API amp_get_conf(AMP *amp, token_t token, char *val)
if (IS_TOKEN_FRONTEND(token)) if (IS_TOKEN_FRONTEND(token))
{ {
return frontamp_get_conf(amp, token, val); return frontamp_get_conf2(amp, token, val, val_len);
} }
if (amp->caps->get_conf == NULL) if (amp->caps->get_conf == NULL)
@ -719,4 +719,8 @@ int HAMLIB_API amp_get_conf(AMP *amp, token_t token, char *val)
return amp->caps->get_conf(amp, token, val); return amp->caps->get_conf(amp, token, val);
} }
int HAMLIB_API amp_get_conf(AMP *amp, token_t token, char *val)
{
return amp_get_conf2(amp, token, val, 128);
}
/** @} */ /** @} */

2
src/amp_conf.h
Wyświetl plik

@ -25,7 +25,7 @@
#include <hamlib/amplifier.h> #include <hamlib/amplifier.h>
int frontamp_set_conf(AMP *amp, token_t token, const char *val); int frontamp_set_conf(AMP *amp, token_t token, const char *val);
int frontamp_get_conf(AMP *amp, token_t token, char *val); static int frontamp_get_conf2(AMP *amp, token_t token, char *val, int val_len);
#endif /* _AMP_CONF_H */ #endif /* _AMP_CONF_H */