Skip to contentSkip to conversation

Fix the route object comparison using the wrong pointer

PATCH Superseded Thomas Jarosch 1 participant 2 messages Aug 24, 2011 – Sep 30, 2011 netfilter

lore
Share & tools
lore

Thomas Jarosch

author
#0 lore raw

PATCH 1/1 Fix the route object comparison using the wrong pointer

Typo detected by cppcheck

Signed-off-by Thomas Jarosch <[email protected]>
---
 lib/route/route_obj.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
lib/route/route_obj.c +1 -1
index 4e14d6d..8f1d4d5 100644
@@ -403,7 +403,7 @@ static int route_compare(struct nl_object *_a, struct nl_object *_b,
 		diff |= ROUTE_DIFF(FLAGS,
 			  (a->rt_flags ^ b->rt_flags) & b->rt_flag_mask);
 	} else {
-		if (a->rt_nr_nh != a->rt_nr_nh)
+		if (a->rt_nr_nh != b->rt_nr_nh)
 			goto nh_mismatch;
 
 		/* search for a dup in each nh of a */
Signature · 1 line
1.7.4.4
author
#1 lore raw
Quoted 12 lines · On Wednesday, 24. August 2011 18:22:55 you wrote:

Typo detected by cppcheck

Signed-off-by Thomas Jarosch <[email protected]>
---
 lib/route/route_obj.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
lib/route/route_obj.c +0 -0
index 4e14d6d..8f1d4d5 100644

lib/route/route_obj.c static int route_compare(struct nl_object *_a, struct · line 409

Quoted 8 lines
lib/route/route_obj.c +1 -1
@@ -403,7 +403,7 @@ static int route_compare(struct nl_object *_a, struct
 nl_object *_b, diff |= ROUTE_DIFF(FLAGS,
 			  (a->rt_flags ^ b->rt_flags) & b->rt_flag_mask);
 	} else {
-		if (a->rt_nr_nh != a->rt_nr_nh)
+		if (a->rt_nr_nh != b->rt_nr_nh)
 			goto nh_mismatch;
 
 		/* search for a dup in each nh of a */

Just a short reminder: This patch is still pending.

Cheers,
Thomas