StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Fixed friend_not_valid function.

Browse Source 
It now returns if friend is valid or not not only if memory location is
valid.
This commit is contained in:
irungentoo 2015-02-17 15:46:14 -05:00
parent 99ee86b865
commit 7cefc9c458
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
toxcore/Messenger.c
View File

@ -44,7 +44,13 @@ static int send_avatar_data_control(const Messenger *m, const uint32_t friendnum
// friend_not_valid determines if the friendnumber passed is valid in the Messenger object // friend_not_valid determines if the friendnumber passed is valid in the Messenger object
static uint8_t friend_not_valid(const Messenger *m, int32_t friendnumber) static uint8_t friend_not_valid(const Messenger *m, int32_t friendnumber)
{ {
return (unsigned int)friendnumber >= m->numfriends; if ((unsigned int)friendnumber < m->numfriends) {
if (m->friendlist[friendnumber].status != 0) {
return 0;
}
}
return 1;
} }
static int add_online_friend(Messenger *m, int32_t friendnumber) static int add_online_friend(Messenger *m, int32_t friendnumber)
@ -113,12 +119,8 @@ int get_real_pk(const Messenger *m, int32_t friendnumber, uint8_t *real_pk)
if (friend_not_valid(m, friendnumber)) if (friend_not_valid(m, friendnumber))
return -1; return -1;
if (m->friendlist[friendnumber].status > 0) {
memcpy(real_pk, m->friendlist[friendnumber].real_pk, crypto_box_PUBLICKEYBYTES); memcpy(real_pk, m->friendlist[friendnumber].real_pk, crypto_box_PUBLICKEYBYTES);
return 0; return 0;
}
return -1;
} }
/* return friend connection id on success. /* return friend connection id on success.
@ -364,7 +366,7 @@ int m_friend_exists(const Messenger *m, int32_t friendnumber)
if (friend_not_valid(m, friendnumber)) if (friend_not_valid(m, friendnumber))
return 0; return 0;
return m->friendlist[friendnumber].status > NOFRIEND; return 1;
} }
/* Send a text chat message to an online friend. /* Send a text chat message to an online friend.