daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
1ff636
From 5acd5e264d53cf293ac5d2e57371690120fb7119 Mon Sep 17 00:00:00 2001
1ff636
From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org>
1ff636
Date: Fri, 20 Feb 2015 15:14:56 -0300
1ff636
Subject: [PATCH] shared: fix wrong assertion in barrier_set_role()
1ff636
1ff636
 assert(b->pipe[0] >= 0 && b->pipe[0] >= 0);
1ff636
1ff636
Test the same condition twice, pretty sure we mean
1ff636
1ff636
 assert(b->pipe[0] >= 0 && b->pipe[1] >= 0);
1ff636
1ff636
(cherry picked from commit 3f7f1fad7621f584d9ce024abb313ecbc9bd0e62)
1ff636
---
1ff636
 src/shared/barrier.c | 2 +-
1ff636
 1 file changed, 1 insertion(+), 1 deletion(-)
1ff636
1ff636
diff --git a/src/shared/barrier.c b/src/shared/barrier.c
c62b8e
index f65363a67b..b7dca75097 100644
1ff636
--- a/src/shared/barrier.c
1ff636
+++ b/src/shared/barrier.c
1ff636
@@ -178,7 +178,7 @@ void barrier_set_role(Barrier *b, unsigned int role) {
1ff636
         assert(b);
1ff636
         assert(role == BARRIER_PARENT || role == BARRIER_CHILD);
1ff636
         /* make sure this is only called once */
1ff636
-        assert(b->pipe[1] >= 0 && b->pipe[1] >= 0);
1ff636
+        assert(b->pipe[0] >= 0 && b->pipe[1] >= 0);
1ff636
 
1ff636
         if (role == BARRIER_PARENT)
1ff636
                 b->pipe[1] = safe_close(b->pipe[1]);