From db126af86a69b9a16b0d14ec1c5f9022a4578814 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Sun, 2 Feb 2020 21:07:53 +0100 Subject: [PATCH] Minor generalization for special cases --- lib/core/agent.py | 5 +++-- lib/core/settings.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/core/agent.py b/lib/core/agent.py index aff58a915..3e260637a 100644 --- a/lib/core/agent.py +++ b/lib/core/agent.py @@ -300,8 +300,9 @@ class Agent(object): where = getTechniqueData().where if where is None else where comment = getTechniqueData().comment if comment is None else comment - if Backend.getIdentifiedDbms() in (DBMS.ACCESS, DBMS.MCKOI) and any((comment or "").startswith(_) for _ in ("--", GENERIC_SQL_COMMENT_MARKER)): - comment = queries[Backend.getIdentifiedDbms()].comment.query + if any((comment or "").startswith(_) for _ in ("--", GENERIC_SQL_COMMENT_MARKER)): + if not GENERIC_SQL_COMMENT.startswith(queries[Backend.getIdentifiedDbms()].comment.query): + comment = queries[Backend.getIdentifiedDbms()].comment.query if comment is not None: expression += comment diff --git a/lib/core/settings.py b/lib/core/settings.py index 89549dae9..a11d21a86 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -18,7 +18,7 @@ from lib.core.enums import OS from thirdparty.six import unichr as _unichr # sqlmap version (...) -VERSION = "1.4.2.4" +VERSION = "1.4.2.5" TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable" TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34} VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)