From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Tue, 5 Apr 2016 13:30:31 +0000 (-0400)
Subject: Fix: remove dead code from filter interpreter
X-Git-Tag: v2.9.0-rc1~150
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=3e6a069401b74471672a89bac283b5e8f61ccf6f;p=lttng-ust.git

Fix: remove dead code from filter interpreter

This has been detected in the lttng-modules port of the filter
interpreter by Coverity. The intent of the code in UST is similar, and
we can find the same dead code, although Coverity may not see it as dead
code because it cannot prove that the string is not modified between the
two uses. Since we know it is not modified, remove the dead code.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/liblttng-ust/lttng-filter-interpreter.c b/liblttng-ust/lttng-filter-interpreter.c
index 1f95dcf5..3eee8e00 100644
--- a/liblttng-ust/lttng-filter-interpreter.c
+++ b/liblttng-ust/lttng-filter-interpreter.c
@@ -72,16 +72,12 @@ int stack_strcmp(struct estack *stack, int top, const char *cmp_type)
 			}
 		}
 		if (unlikely(q - estack_ax(stack, top)->u.s.str >= estack_ax(stack, top)->u.s.seq_len || *q == '\0')) {
-			if (p - estack_bx(stack, top)->u.s.str >= estack_bx(stack, top)->u.s.seq_len || *p == '\0') {
-				return 0;
-			} else {
-				if (estack_bx(stack, top)->u.s.literal) {
-					ret = parse_char(&p);
-					if (ret == -1)
-						return 0;
-				}
-				return 1;
+			if (estack_bx(stack, top)->u.s.literal) {
+				ret = parse_char(&p);
+				if (ret == -1)
+					return 0;
 			}
+			return 1;
 		}
 		if (estack_bx(stack, top)->u.s.literal) {
 			ret = parse_char(&p);