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

Small code cleanup.

Browse Source
This commit is contained in:
irungentoo 2014-08-22 15:51:07 -04:00
parent 6408c7de50
commit 43723f2970
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
toxcore/Messenger.c
View File

@ -388,14 +388,14 @@ uint32_t m_sendmessage(Messenger *m, int32_t friendnumber, const uint8_t *messag
uint32_t m_sendmessage_withid(Messenger *m, int32_t friendnumber, uint32_t theid, const uint8_t *message, uint32_t m_sendmessage_withid(Messenger *m, int32_t friendnumber, uint32_t theid, const uint8_t *message,
uint32_t length) uint32_t length)
{ {
if (length >= (MAX_CRYPTO_DATA_SIZE - sizeof(theid))) if (length >= (MAX_CRYPTO_DATA_SIZE - sizeof(theid)) || length == 0)
return 0; return 0;
uint8_t temp[MAX_CRYPTO_DATA_SIZE]; uint8_t temp[sizeof(theid) + length];
theid = htonl(theid); theid = htonl(theid);
memcpy(temp, &theid, sizeof(theid)); memcpy(temp, &theid, sizeof(theid));
memcpy(temp + sizeof(theid), message, length); memcpy(temp + sizeof(theid), message, length);
return write_cryptpacket_id(m, friendnumber, PACKET_ID_MESSAGE, temp, length + sizeof(theid)); return write_cryptpacket_id(m, friendnumber, PACKET_ID_MESSAGE, temp, sizeof(temp));
} }
/* Send an action to an online friend. /* Send an action to an online friend.
@ -423,14 +423,14 @@ uint32_t m_sendaction(Messenger *m, int32_t friendnumber, const uint8_t *action,
uint32_t m_sendaction_withid(const Messenger *m, int32_t friendnumber, uint32_t theid, const uint8_t *action, uint32_t m_sendaction_withid(const Messenger *m, int32_t friendnumber, uint32_t theid, const uint8_t *action,
uint32_t length) uint32_t length)
{ {
if (length >= (MAX_CRYPTO_DATA_SIZE - sizeof(theid))) if (length >= (MAX_CRYPTO_DATA_SIZE - sizeof(theid)) || length == 0)
return 0; return 0;
uint8_t temp[MAX_CRYPTO_DATA_SIZE]; uint8_t temp[sizeof(theid) + length];
theid = htonl(theid); theid = htonl(theid);
memcpy(temp, &theid, sizeof(theid)); memcpy(temp, &theid, sizeof(theid));
memcpy(temp + sizeof(theid), action, length); memcpy(temp + sizeof(theid), action, length);
return write_cryptpacket_id(m, friendnumber, PACKET_ID_ACTION, temp, length + sizeof(theid)); return write_cryptpacket_id(m, friendnumber, PACKET_ID_ACTION, temp, sizeof(temp));
} }
/* Send a name packet to friendnumber. /* Send a name packet to friendnumber.