Skip to content

Commit 4b9b6a4

Browse files
committed
interface/guigame: avoid string overflow and string overlap warnings
1 parent cde9b0a commit 4b9b6a4

File tree

1 file changed

+5
-14
lines changed

1 file changed

+5
-14
lines changed

src/guigame.c

+5-14
Original file line numberDiff line numberDiff line change
@@ -460,29 +460,20 @@ static u8 ds3_mac[6];
460460
static u8 dg_mac[6];
461461
static char ds3_str[18];
462462
static char dg_str[18];
463-
static char vid_str[4];
464-
static char pid_str[4];
465-
static char rev_str[4];
463+
static char vid_str[5];
464+
static char pid_str[5];
465+
static char rev_str[5];
466466
static char hci_str[26];
467467
static char lmp_str[26];
468-
static char man_str[4];
468+
static char man_str[5];
469469
static int ds3macset = 0;
470470
static int dgmacset = 0;
471471
static int dg_discon = 0;
472472
static int ver_set = 0, feat_set = 0;
473473

474474
static char *bdaddr_to_str(u8 *bdaddr, char *addstr)
475475
{
476-
int i;
477-
478-
memset(addstr, 0, sizeof(addstr));
479-
480-
for (i = 0; i < 6; i++) {
481-
sprintf(addstr, "%s%02X", addstr, bdaddr[i]);
482-
483-
if (i < 5)
484-
sprintf(addstr, "%s:", addstr);
485-
}
476+
snprintf(addstr, 18, "%02X:%02X:%02X:%02X:%02X:%02X", bdaddr[0], bdaddr[1], bdaddr[2], bdaddr[3], bdaddr[4], bdaddr[5]);
486477

487478
return addstr;
488479
}

0 commit comments

Comments
 (0)