From 3d23f226ae34d311c9a82d1e7e98d10081cfbcad Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Mon, 27 Dec 2010 11:47:50 +0000 Subject: [PATCH] minor update --- plugins/generic/enumeration.py | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/plugins/generic/enumeration.py b/plugins/generic/enumeration.py index 0e1f6713e..69cf35cbe 100644 --- a/plugins/generic/enumeration.py +++ b/plugins/generic/enumeration.py @@ -1218,6 +1218,8 @@ class Enumeration: indexRange = getRange(count, dump=True, plusOne=plusOne) if kb.dbms == DBMS.ACCESS: + validColumnList = False + for column in colList: infoMsg = "fetching number of distinct " infoMsg += "values for column '%s'" % column @@ -1226,14 +1228,20 @@ class Enumeration: query = rootQuery.blind.count2 % (column, conf.tbl) value = inject.getValue(query, inband=False) - if isNumPosStrValue(value) and value == count: - infoMsg = "using column '%s' as a pivot " % column - infoMsg += "for retrieving row data" - logger.info(infoMsg) + if isNumPosStrValue(value): + validColumnList = True + if value == count: + infoMsg = "using column '%s' as a pivot " % column + infoMsg += "for retrieving row data" + logger.info(infoMsg) - colList.remove(column) - colList.insert(0, column) - break + colList.remove(column) + colList.insert(0, column) + break + + if not validColumnList: + errMsg = "all column name(s) provided are non-existent" + raise sqlmapNoneDataException, errMsg pivotValue = " " for index in indexRange: