From 6d29a35ac901c8258e9bb5680286e814005f43a9 Mon Sep 17 00:00:00 2001 From: Owen Mansel-Chan <62447351+owen-mc@users.noreply.github.com> Date: Mon, 15 Feb 2021 11:18:22 +0000 Subject: [PATCH] Factor the duplicate code in LogCall Co-authored-by: Chris Smowton --- ql/src/semmle/go/frameworks/Logrus.qll | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/ql/src/semmle/go/frameworks/Logrus.qll b/ql/src/semmle/go/frameworks/Logrus.qll index 7c9ec711197..d89fc9db35f 100644 --- a/ql/src/semmle/go/frameworks/Logrus.qll +++ b/ql/src/semmle/go/frameworks/Logrus.qll @@ -22,12 +22,10 @@ module Logrus { private class LogCall extends LoggerCall::Range, DataFlow::CallNode { LogCall() { - this.getTarget().hasQualifiedName(packagePath(), getALogResultName()) or - this.getTarget().(Method).hasQualifiedName(packagePath(), "Entry", getALogResultName()) or - this.getTarget().hasQualifiedName(packagePath(), getAnEntryUpdatingMethodName()) or - this.getTarget() - .(Method) - .hasQualifiedName(packagePath(), "Entry", getAnEntryUpdatingMethodName()) + exists(string name | name = getALogResultName() or name = getAnEntryUpdatingMethodName() | + this.getTarget().hasQualifiedName(packagePath(), name) or + this.getTarget().(Method).hasQualifiedName(packagePath(), "Entry", name) + ) } override DataFlow::Node getAMessageComponent() { result = this.getAnArgument() }