From 5f3235ef573b7fa8366b3516ad215d613234e4cb Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Tue, 30 May 2017 11:40:06 +0200
Subject: [PATCH] Fixes #2551

---
 lib/core/common.py   | 4 ++--
 lib/core/settings.py | 2 +-
 txt/checksum.md5     | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/core/common.py b/lib/core/common.py
index 411963670..a1f3a6fe6 100644
--- a/lib/core/common.py
+++ b/lib/core/common.py
@@ -1196,12 +1196,12 @@ def cleanQuery(query):
 
     for sqlStatements in SQL_STATEMENTS.values():
         for sqlStatement in sqlStatements:
-            sqlStatementEsc = sqlStatement.replace("(", "\\(")
-            queryMatch = re.search("(%s)" % sqlStatementEsc, query, re.I)
+            queryMatch = re.search("(?i)\b(%s)\b" % sqlStatement.replace("(", "").replace(")", "").strip(), query)
 
             if queryMatch and "sys_exec" not in query:
                 retVal = retVal.replace(queryMatch.group(1), sqlStatement.upper())
 
+
     return retVal
 
 def setPaths(rootPath):
diff --git a/lib/core/settings.py b/lib/core/settings.py
index 13523470f..59bd0dd7c 100755
--- a/lib/core/settings.py
+++ b/lib/core/settings.py
@@ -19,7 +19,7 @@ from lib.core.enums import DBMS_DIRECTORY_NAME
 from lib.core.enums import OS
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.1.5.16"
+VERSION = "1.1.5.17"
 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)
diff --git a/txt/checksum.md5 b/txt/checksum.md5
index e4c95562d..8e0782a0c 100644
--- a/txt/checksum.md5
+++ b/txt/checksum.md5
@@ -27,7 +27,7 @@ fec857280fd553ee7e9b49fdfe104402  lib/controller/checks.py
 310efc965c862cfbd7b0da5150a5ad36  lib/controller/__init__.py
 60599fbb43b7d5e658b84371d3ad0b42  lib/core/agent.py
 6cc95a117fbd34ef31b9aa25520f0e31  lib/core/bigarray.py
-6c8507976da31524e7afa3886d13bf4f  lib/core/common.py
+2fddcfef540e6545e7e315225db9aaa7  lib/core/common.py
 5065a4242a8cccf72f91e22e1007ae63  lib/core/convert.py
 a8143dab9d3a27490f7d49b6b29ea530  lib/core/data.py
 7936d78b1a7f1f008ff92bf2f88574ba  lib/core/datatype.py
@@ -46,7 +46,7 @@ d85f2f63ffcb6135400339f9a7595a7b  lib/core/option.py
 d8e9250f3775119df07e9070eddccd16  lib/core/replication.py
 785f86e3f963fa3798f84286a4e83ff2  lib/core/revision.py
 40c80b28b3a5819b737a5a17d4565ae9  lib/core/session.py
-8c82b503090da324c876065bc1b7338c  lib/core/settings.py
+5d772fb6c8f4c03f8a8a42166c72761d  lib/core/settings.py
 d91291997d2bd2f6028aaf371bf1d3b6  lib/core/shell.py
 2ad85c130cc5f2b3701ea85c2f6bbf20  lib/core/subprocessng.py
 8136241fdbdb99a5dc0e51ba72918f6e  lib/core/target.py