distinguishing NULL from BLANK

stamparm · stamparm · commit ca0d068575b8 · 2012-03-14T13:52:23.000Z
diff --git a/lib/core/dump.py b/lib/core/dump.py
@@ -28,6 +28,7 @@
 from lib.core.enums import DBMS
 from lib.core.exception import sqlmapValueException
 from lib.core.replication import Replication
+from lib.core.settings import BLANK
 from lib.core.settings import BUFFERED_LOG_SIZE
 from lib.core.settings import NULL
 from lib.core.settings import TRIM_STDOUT_DUMP_SIZE
@@ -377,7 +378,7 @@ def dbTableValues(self, tableValues):
 
                     for value in tableValues[column]['values']:
                         try:
-                            if not value or re.search("^[\ *]*$", value): #NULL
+                            if not value or value == " ":  # NULL
                                 continue
 
                             int(value)
@@ -390,7 +391,7 @@ def dbTableValues(self, tableValues):
 
                         for value in tableValues[column]['values']:
                             try:
-                                if not value or re.search("^[\ *]*$", value): #NULL
+                                if not value or value == " ":  # NULL
                                     continue
 
                                 float(value)
@@ -455,9 +456,7 @@ def dbTableValues(self, tableValues):
                         value = u''
                     else:
                         value = getUnicode(info["values"][i])
-
-                        if re.search("^[\ *]*$", value):
-                            value = NULL
+                        value = {" ": NULL, "": BLANK}.get(value, value)
 
                     values.append(value)
                     maxlength = int(info["length"])
diff --git a/lib/core/settings.py b/lib/core/settings.py
@@ -253,6 +253,9 @@
 # string representation for NULL value
 NULL = "NULL"
 
+# string representation for blank ('') value
+BLANK = "<blank>"
+
 # string representation for current database
 CURRENT_DB = "CD"
 
diff --git a/plugins/generic/enumeration.py b/plugins/generic/enumeration.py
@@ -55,10 +55,12 @@
 from lib.core.exception import sqlmapUnsupportedFeatureException
 from lib.core.exception import sqlmapUserQuitException
 from lib.core.session import setOs
+from lib.core.settings import BLANK
 from lib.core.settings import CONCAT_ROW_DELIMITER
 from lib.core.settings import CONCAT_VALUE_DELIMITER
 from lib.core.settings import CURRENT_DB
 from lib.core.settings import MAX_INT
+from lib.core.settings import NULL
 from lib.core.settings import SQL_STATEMENTS
 from lib.core.shell import autoCompletion
 from lib.core.threads import getCurrentThreadData
@@ -1635,7 +1637,7 @@ def dumpTable(self, foundData=None):
                             else:
                                 colEntry = entry[index] if index < len(entry) else u''
 
-                            colEntryLen = len(getUnicode(colEntry))
+                            colEntryLen = len({" ": NULL, "": BLANK}.get(getUnicode(colEntry), getUnicode(colEntry)))
                             maxLen = max(colLen, colEntryLen)
 
                             if maxLen > kb.data.dumpedTable[column]["length"]:
