diff options
| author | Nick ODell <nickodell@gmail.com> | 2013-08-06 16:55:11 -0600 |
|---|---|---|
| committer | Nick ODell <nickodell@gmail.com> | 2013-08-06 18:11:13 -0600 |
| commit | 7ddeb2bf6da9e68d8963ff703ec85284f7ed73ba (patch) | |
| tree | 859b6ce81deb88e5fc27298de6a4d016293eaacd /core/Messenger.c | |
| parent | f603342acfdc4196a91e0f2356f2ffb286b02d81 (diff) | |
Fix bug where we could run past the end of the friends list
Diffstat (limited to 'core/Messenger.c')
| -rw-r--r-- | core/Messenger.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/Messenger.c b/core/Messenger.c index 9fa643bb..5532c9cc 100644 --- a/core/Messenger.c +++ b/core/Messenger.c | |||
| @@ -116,7 +116,7 @@ int m_addfriend(uint8_t *client_id, uint8_t *data, uint16_t length) | |||
| 116 | return FAERR_ALREADYSENT; | 116 | return FAERR_ALREADYSENT; |
| 117 | 117 | ||
| 118 | uint32_t i; | 118 | uint32_t i; |
| 119 | for (i = 0; i <= numfriends && i <= MAX_NUM_FRIENDS; ++i) { /*TODO: dynamic memory allocation to allow for more than MAX_NUM_FRIENDS friends */ | 119 | for (i = 0; i < numfriends && i < MAX_NUM_FRIENDS; ++i) { /*TODO: dynamic memory allocation to allow for more than MAX_NUM_FRIENDS friends */ |
| 120 | if(friendlist[i].status == NOFRIEND) { | 120 | if(friendlist[i].status == NOFRIEND) { |
| 121 | DHT_addfriend(client_id); | 121 | DHT_addfriend(client_id); |
| 122 | friendlist[i].status = FRIEND_ADDED; | 122 | friendlist[i].status = FRIEND_ADDED; |
| @@ -141,7 +141,7 @@ int m_addfriend_norequest(uint8_t * client_id) | |||
| 141 | if (getfriend_id(client_id) != -1) | 141 | if (getfriend_id(client_id) != -1) |
| 142 | return -1; | 142 | return -1; |
| 143 | uint32_t i; | 143 | uint32_t i; |
| 144 | for (i = 0; i <= numfriends && i <= MAX_NUM_FRIENDS; ++i) { /*TODO: dynamic memory allocation to allow for more than MAX_NUM_FRIENDS friends */ | 144 | for (i = 0; i < numfriends && i < MAX_NUM_FRIENDS; ++i) { /*TODO: dynamic memory allocation to allow for more than MAX_NUM_FRIENDS friends */ |
| 145 | if(friendlist[i].status == NOFRIEND) { | 145 | if(friendlist[i].status == NOFRIEND) { |
| 146 | DHT_addfriend(client_id); | 146 | DHT_addfriend(client_id); |
| 147 | friendlist[i].status = FRIEND_REQUESTED; | 147 | friendlist[i].status = FRIEND_REQUESTED; |