From 68462466f2d76e381ffef3b91d322606728158c0 Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Mon, 27 Dec 2010 11:36:36 +0000
Subject: [PATCH] minor fix for a bug reported by shaohua pan (argument of type
 'NoneType' is not iterable)

---
 plugins/generic/enumeration.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/generic/enumeration.py b/plugins/generic/enumeration.py
index 4c45e3da1..0e1f6713e 100644
--- a/plugins/generic/enumeration.py
+++ b/plugins/generic/enumeration.py
@@ -1117,8 +1117,12 @@ class Enumeration:
 
         if conf.col:
             colList = conf.col.split(",")
-        else:
+        elif kb.data.cachedColumns and conf.db in kb.data.cachedColumns and conf.tbl in kb.data.cachedColumns[conf.db]:
             colList = kb.data.cachedColumns[conf.db][conf.tbl].keys()
+        else:
+            errMsg  = "missing column names, "
+            errMsg += "can't dump table"
+            raise sqlmapNoneDataException, errMsg
 
         if colList in ([None], ['None']):
             warnMsg = "unable to retrieve column names"