[asterisk-commits] res rtp asterisk: Fix a self-comparison identified by gcc 6 (asterisk[certified/11.6])

[SVN commits to the Asterisk project]

Joshua Colp has submitted this change and it was merged.

Change subject: res_rtp_asterisk:  Fix a self-comparison identified by gcc 6
......................................................................


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
(cherry picked from commit 9548ccca0e56470c9a32360da73f687ae05376f5)
---
M res/res_rtp_asterisk.c
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Joshua Colp: Looks good to me, approved; Verified



diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c
index f10dee8..4bbbc86 100644
--- a/res/res_rtp_asterisk.c
+++ b/res/res_rtp_asterisk.c
@@ -455,8 +455,8 @@
 
 	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;
 	}
 

-- 
To view, visit https://gerrit.asterisk.org/3259
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3da713c568e24064430257b3502fbdafd35af7a7
Gerrit-PatchSet: 2
Gerrit-Project: asterisk
Gerrit-Branch: certified/11.6
Gerrit-Owner: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>