summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2005-08-05 03:24:28 +0000
committerMarcel Holtmann <marcel@holtmann.org>2005-08-05 03:24:28 +0000
commit8ac83f1424fe8c726aeeccda705c6840d5b31ab9 (patch)
tree478426464022921296a6b725040b3db7e7ad89a7
parent60c5a5c604ce503104b6de2dd52ff5ef9df521e4 (diff)
Correctly terminate the device name string
-rw-r--r--tools/hciconfig.c3
-rw-r--r--tools/hcitool.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/tools/hciconfig.c b/tools/hciconfig.c
index 4dfb57a7..ca44831f 100644
--- a/tools/hciconfig.c
+++ b/tools/hciconfig.c
@@ -437,7 +437,7 @@ static void cmd_name(int ctl, int hdev, char *opt)
exit(1);
}
} else {
- char name[248];
+ char name[249];
int i;
if (hci_read_local_name(s, sizeof(name), name, 1000) < 0) {
fprintf(stderr, "Can't read local name on hci%d: %s (%d)\n",
@@ -447,6 +447,7 @@ static void cmd_name(int ctl, int hdev, char *opt)
for (i = 0; i < 248 && name[i]; i++)
if (!isprint(name[i]))
name[i] = '.';
+ name[248] = '\0';
print_dev_hdr(&di);
printf("\tName: '%s'\n", name);
}
diff --git a/tools/hcitool.c b/tools/hcitool.c
index 156b0790..ba8ba823 100644
--- a/tools/hcitool.c
+++ b/tools/hcitool.c
@@ -514,6 +514,7 @@ static void cmd_scan(int dev_id, int argc, char **argv)
for (n = 0; n < 248 && name[n]; n++)
if (!isprint(name[n]))
name[n] = '.';
+ name[248] = '\0';
printf("\t%s\t%s\n", addr, name);
continue;
@@ -572,6 +573,7 @@ static void cmd_scan(int dev_id, int argc, char **argv)
for (n = 0; n < 248 && name[n]; n++)
if (!isprint(name[n]))
name[n] = '.';
+ name[248] = '\0';
nc = 0;
}
}