Fixes sqlmapproject#1582

stamparm · stamparm · commit d5e6be41db06 · 2015-12-06T23:24:09.000+01:00
diff --git a/lib/utils/pivotdumptable.py b/lib/utils/pivotdumptable.py
@@ -64,15 +64,19 @@ def pivotDumpTable(table, colList, count=None, blind=True):
     colList = filter(None, sorted(colList, key=lambda x: len(x) if x else MAX_INT))
 
     if conf.pivotColumn:
-        if any(re.search(r"(.+\.)?%s" % re.escape(conf.pivotColumn), _, re.I) for _ in colList):
-            infoMsg = "using column '%s' as a pivot " % conf.pivotColumn
-            infoMsg += "for retrieving row data"
-            logger.info(infoMsg)
+        for _ in colList:
+            if re.search(r"(.+\.)?%s" % re.escape(conf.pivotColumn), _, re.I):
+                infoMsg = "using column '%s' as a pivot " % conf.pivotColumn
+                infoMsg += "for retrieving row data"
+                logger.info(infoMsg)
 
-            validPivotValue = True
-            colList.remove(conf.pivotColumn)
-            colList.insert(0, conf.pivotColumn)
-        else:
+                colList.remove(_)
+                colList.insert(0, _)
+
+                validPivotValue = True
+                break
+
+        if not validPivotValue:
             warnMsg = "column '%s' not " % conf.pivotColumn
             warnMsg += "found in table '%s'" % table
             logger.warn(warnMsg)
