From fba1720b31f99a9eb08733519ee06849431ec2f4 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Tue, 31 May 2016 11:16:13 +0200 Subject: [PATCH] Minor patch --- lib/core/agent.py | 9 +++++---- lib/core/settings.py | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/core/agent.py b/lib/core/agent.py index 8aa271603..dcecc8762 100644 --- a/lib/core/agent.py +++ b/lib/core/agent.py @@ -721,10 +721,11 @@ class Agent(object): if conf.uFrom: fromTable = " FROM %s" % conf.uFrom - elif kb.tableFrom: - fromTable = " FROM %s" % kb.tableFrom - else: - fromTable = fromTable or FROM_DUMMY_TABLE.get(Backend.getIdentifiedDbms(), "") + elif not fromTable: + if kb.tableFrom: + fromTable = " FROM %s" % kb.tableFrom + else: + fromTable = FROM_DUMMY_TABLE.get(Backend.getIdentifiedDbms(), "") if query.startswith("SELECT "): query = query[len("SELECT "):] diff --git a/lib/core/settings.py b/lib/core/settings.py index 72b13a5ba..9410c4170 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -19,7 +19,7 @@ from lib.core.enums import OS from lib.core.revision import getRevisionNumber # sqlmap version (...) -VERSION = "1.0.5.121" +VERSION = "1.0.5.122" REVISION = getRevisionNumber() STABLE = VERSION.count('.') <= 2 VERSION_STRING = "sqlmap/%s#%s" % (VERSION, "stable" if STABLE else "dev")