From cd7126b39650dfd99ae1cb73e339e5c9824b04ba Mon Sep 17 00:00:00 2001 From: Christopher Faulet Date: Thu, 11 Feb 2021 11:13:33 +0100 Subject: [PATCH] CLEANUP: queue: Remove useless tests on p or pp in pendconn_process_next_strm() This patch removes unecessary tests on p or pp pointers in pendconn_process_next_strm() function. This should make cppcheck happy and avoid false report of null pointer dereference. This patch should fix the issue #1036. --- src/queue.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/queue.c b/src/queue.c index 19b99a5f6..815780939 100644 --- a/src/queue.c +++ b/src/queue.c @@ -281,12 +281,12 @@ static int pendconn_process_next_strm(struct server *srv, struct proxy *px) if (!p && !pp) return 0; + else if (!pp) + goto use_p; /* p != NULL */ + else if (!p) + goto use_pp; /* pp != NULL */ - if (p && !pp) - goto use_p; - - if (pp && !p) - goto use_pp; + /* p != NULL && pp != NULL*/ if (KEY_CLASS(p->node.key) < KEY_CLASS(pp->node.key)) goto use_p;