mirrors/coturn
1
0
Fork 0
mirror of https://github.com/coturn/coturn.git synced 2025-10-30 14:31:29 +01:00
Code Issues Projects Releases Wiki Activity

Make sure we zero out any padding added to the attribute

Browse Source
This commit is contained in:
Haseeb Abdul Qadir 2021-05-22 11:53:25 -04:00
parent 93c5387180
commit e88de80abd
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/client/ns_turn_msg.c
View File

@ -1448,8 +1448,10 @@ int stun_attr_add_str(uint8_t* buf, size_t *len, uint16_t attr, const uint8_t* a
int clen = stun_get_command_message_len_str(buf,*len); int clen = stun_get_command_message_len_str(buf,*len);
int newlen = clen + 4 + alen; int newlen = clen + 4 + alen;
int newlenrem4=newlen & 0x00000003; int newlenrem4=newlen & 0x00000003;
int paddinglen = 0;
if(newlenrem4) { if(newlenrem4) {
newlen=newlen+(4-newlenrem4); paddinglen=4-newlenrem4;
newlen=newlen+paddinglen;
} }
if(newlen>=MAX_STUN_MESSAGE_SIZE) return -1; if(newlen>=MAX_STUN_MESSAGE_SIZE) return -1;
else { else {
@ -1463,6 +1465,10 @@ int stun_attr_add_str(uint8_t* buf, size_t *len, uint16_t attr, const uint8_t* a
attr_start_16t[0]=nswap16(attr); attr_start_16t[0]=nswap16(attr);
attr_start_16t[1]=nswap16(alen); attr_start_16t[1]=nswap16(alen);
if(alen>0) bcopy(avalue,attr_start+4,alen); if(alen>0) bcopy(avalue,attr_start+4,alen);
// Write 0 padding to not leak data
bzero(attr_start+4+alen, paddinglen);
return 0; return 0;
} }
} }