diff options
| author | Harald Welte <laforge@gnumonks.org> | 2018-08-11 14:15:09 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2018-08-11 16:10:31 +0200 |
| commit | d4fb4fdea097f0fd1e9f2cd72d0d8a30c91f48bf (patch) | |
| tree | 2a76d28f1dfc3ad338cec98d08c66fd1cf826b61 /src/host/layer23/src/mobile/vty_interface.c | |
| parent | 1d68468636e789555bee99e1d040b0648d1f02c3 (diff) | |
layer23: Replace all instances of strncpy() by osmo_strlcpy
This gives us working/safe zero termination without overflowing
the destination string size.
Change-Id: Ica6098ceba2bd01ce3b216085442cc5eed0ca507
Diffstat (limited to 'src/host/layer23/src/mobile/vty_interface.c')
| -rw-r--r-- | src/host/layer23/src/mobile/vty_interface.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index 4adcf905..12c32a53 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -1582,8 +1582,7 @@ DEFUN(cfg_ms_layer2, cfg_ms_layer2_cmd, "layer2-socket PATH", struct osmocom_ms *ms = vty->index; struct gsm_settings *set = &ms->settings; - strncpy(set->layer2_socket_path, argv[0], - sizeof(set->layer2_socket_path) - 1); + OSMO_STRLCPY_ARRAY(set->layer2_socket_path, argv[0]); vty_restart(vty, ms); return CMD_SUCCESS; @@ -1596,8 +1595,7 @@ DEFUN(cfg_ms_sap, cfg_ms_sap_cmd, "sap-socket PATH", struct osmocom_ms *ms = vty->index; struct gsm_settings *set = &ms->settings; - strncpy(set->sap_socket_path, argv[0], - sizeof(set->sap_socket_path) - 1); + OSMO_STRLCPY_ARRAY(set->sap_socket_path, argv[0]); vty_restart(vty, ms); return CMD_SUCCESS; @@ -2134,10 +2132,10 @@ DEFUN(cfg_abbrev, cfg_ms_abbrev_cmd, "abbrev ABBREVIATION NUMBER [NAME]", return CMD_WARNING; } llist_add_tail(&abbrev->list, &set->abbrev); - strncpy(abbrev->abbrev, argv[0], sizeof(abbrev->abbrev) - 1); - strncpy(abbrev->number, argv[1], sizeof(abbrev->number) - 1); + OSMO_STRLCPY_ARRAY(abbrev->abbrev, argv[0]); + OSMO_STRLCPY_ARRAY(abbrev->number, argv[1]); if (argc >= 3) - strncpy(abbrev->name, argv[2], sizeof(abbrev->name) - 1); + OSMO_STRLCPY_ARRAY(abbrev->name, argv[2]); return CMD_SUCCESS; } |