diff options
| author | George Joseph <gjoseph@digium.com> | 2016-06-22 12:41:57 -0600 |
|---|---|---|
| committer | George Joseph <gjoseph@digium.com> | 2016-06-22 12:41:57 -0600 |
| commit | 48db4c215924f2881f6eef79ae120f6a3166ad63 (patch) | |
| tree | c78768505e445d84d0c7363328cb8b4daabda571 /res/res_rtp_asterisk.c | |
| parent | dfcd466bf03104c570c501af1571654370e50de7 (diff) | |
res_rtp_asterisk: Fix a self-comparison identified by gcc 6
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
Diffstat (limited to 'res/res_rtp_asterisk.c')
| -rw-r--r-- | res/res_rtp_asterisk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c index bb4c0af1a..feab1ca80 100644 --- a/res/res_rtp_asterisk.c +++ b/res/res_rtp_asterisk.c @@ -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; } |