Skip to content

Commit 84f213f

Browse files
authored
Merge pull request #504 from wmww/fix-valgrind-problems
Fix minor problems caught by valgrind
2 parents 45d5f34 + 584245a commit 84f213f

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

src/psmove.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,9 @@ psmove_connect_internal(const wchar_t *serial, const char *path, int id, unsigne
565565
if (move->connection_type == Conn_Unknown) {
566566
move->connection_type = Conn_USB;
567567
}
568-
move->serial_number = psmove_get_serial(move);
568+
char* new_serial = psmove_get_serial(move);
569+
free(move->serial_number);
570+
move->serial_number = new_serial;
569571
}
570572

571573
// Recently disconnected controllers might still show up in hidapi (especially Windows).
@@ -916,7 +918,7 @@ psmove_connect()
916918
int
917919
_psmove_read_btaddrs(PSMove *move, PSMove_Data_BTAddr *host, PSMove_Data_BTAddr *controller)
918920
{
919-
unsigned char btg[PSMOVE_MAX_BTADDR_GET_SIZE];
921+
unsigned char btg[PSMOVE_MAX_BTADDR_GET_SIZE] = {0};
920922
size_t report_size = PSMOVE_BTADDR_GET_SIZE;
921923
int res;
922924

0 commit comments

Comments
 (0)