From 408869427edc59058b6e7680e612b3a6cd46edc1 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Tue, 27 Dec 2011 15:44:41 -0800 Subject: [PATCH] bundle: Fix returned error code in one bundle_check() corner case. In C, the || operator yields 0 or 1, not (as in some other languages) the value of its first nonzero operand. Found by inspection. Signed-off-by: Ben Pfaff --- lib/bundle.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bundle.c b/lib/bundle.c index af1be630..5db97d39 100644 --- a/lib/bundle.c +++ b/lib/bundle.c @@ -152,8 +152,8 @@ bundle_check(const struct nx_action_bundle *nab, int max_ports, VLOG_WARN_RL(&rl, "bundle_load action requires at least 16 bit " "destination."); error = ofp_mkerr(OFPET_BAD_ACTION, OFPBAC_BAD_ARGUMENT); - } else { - error = nxm_dst_check(nab->dst, ofs, n_bits, flow) || error; + } else if (!error) { + error = nxm_dst_check(nab->dst, ofs, n_bits, flow); } } -- 2.30.2