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

Added some more checks for file packets.

Browse Source
This commit is contained in:
irungentoo 2015-03-23 16:56:56 -04:00
parent 8aaddd729c
commit 47d1c1db7e
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
toxcore/Messenger.c
View File

@ -2040,9 +2040,17 @@ static int handle_packet(void *object, int i, uint8_t *temp, uint16_t len)
break; break;
uint8_t filenumber = data[0]; uint8_t filenumber = data[0];
if (filenumber >= MAX_CONCURRENT_FILE_PIPES)
break;
uint64_t filesize; uint64_t filesize;
uint32_t file_type; uint32_t file_type;
uint16_t filename_length = data_length - head_length; uint16_t filename_length = data_length - head_length;
if (filename_length > MAX_FILENAME_LENGTH)
break;
memcpy(&file_type, data + 1, sizeof(file_type)); memcpy(&file_type, data + 1, sizeof(file_type));
file_type = ntohl(file_type); file_type = ntohl(file_type);
@ -2088,6 +2096,9 @@ static int handle_packet(void *object, int i, uint8_t *temp, uint16_t len)
uint8_t filenumber = data[1]; uint8_t filenumber = data[1];
uint8_t control_type = data[2]; uint8_t control_type = data[2];
if (filenumber >= MAX_CONCURRENT_FILE_PIPES)
break;
if (handle_filecontrol(m, i, send_receive, filenumber, control_type, data + 3, data_length - 3) == -1) if (handle_filecontrol(m, i, send_receive, filenumber, control_type, data + 3, data_length - 3) == -1)
break; break;
@ -2099,6 +2110,10 @@ static int handle_packet(void *object, int i, uint8_t *temp, uint16_t len)
break; break;
uint8_t filenumber = data[0]; uint8_t filenumber = data[0];
if (filenumber >= MAX_CONCURRENT_FILE_PIPES)
break;
struct File_Transfers *ft = &m->friendlist[i].file_receiving[filenumber]; struct File_Transfers *ft = &m->friendlist[i].file_receiving[filenumber];
if (ft->status != FILESTATUS_TRANSFERRING) if (ft->status != FILESTATUS_TRANSFERRING)