kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 20:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_rtp_asterisk: Fix a self-comparison identified by gcc 6

Browse Source 
gcc 6 caught a previously unidentified self-comparison in
ice_candidate_cmp.  Fixed it and re-ordered the predicates for better
short-circuiting.

ASTERISK-26140 #close

Change-Id: I3da713c568e24064430257b3502fbdafd35af7a7
This commit is contained in:
George Joseph
2016-06-22 12:41:57 -06:00
parent aec09d9c09
commit d293ead077
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/res_rtp_asterisk.c
View File

@@ -540,8 +540,8 @@ static int ice_candidate_cmp(void *obj, void *arg, int flags)
if (strcmp(candidate1->foundation, candidate2->foundation) ||
candidate1->id != candidate2->id ||
ast_sockaddr_cmp(&candidate1->address, &candidate2->address) ||
candidate1->type != candidate1->type) {
candidate1->type != candidate2->type ||
ast_sockaddr_cmp(&candidate1->address, &candidate2->address)) {
return 0;
}