Patch related to the #1659

stamparm · stamparm · commit 9b716fcce95b · 2016-01-12T10:24:28.000+01:00
diff --git a/lib/core/dump.py b/lib/core/dump.py
@@ -398,36 +398,39 @@ def dbTableValues(self, tableValues):
             self._write(tableValues, content_type=CONTENT_TYPE.DUMP_TABLE)
             return
 
-        _ = re.sub(r"[^\w]", "_", normalizeUnicode(unsafeSQLIdentificatorNaming(db)))
-        if len(_) < len(db) or IS_WIN and db.upper() in WINDOWS_RESERVED_NAMES:
-            _ = unicodeencode(re.sub(r"[^\w]", "_", unsafeSQLIdentificatorNaming(db)))
-            dumpDbPath = os.path.join(conf.dumpPath, "%s-%s" % (_, hashlib.md5(unicodeencode(db)).hexdigest()[:8]))
-            warnFile = True
-        else:
-            dumpDbPath = os.path.join(conf.dumpPath, _)
-
         if conf.dumpFormat == DUMP_FORMAT.SQLITE:
             replication = Replication(os.path.join(conf.dumpPath, "%s.sqlite3" % unsafeSQLIdentificatorNaming(db)))
         elif conf.dumpFormat in (DUMP_FORMAT.CSV, DUMP_FORMAT.HTML):
+            dumpDbPath = os.path.join(conf.dumpPath, unsafeSQLIdentificatorNaming(db))
+
             if not os.path.isdir(dumpDbPath):
                 try:
                     os.makedirs(dumpDbPath, 0755)
-                except (OSError, IOError), ex:
-                    try:
-                        tempDir = tempfile.mkdtemp(prefix="sqlmapdb")
-                    except IOError, _:
-                        errMsg = "unable to write to the temporary directory ('%s'). " % _
-                        errMsg += "Please make sure that your disk is not full and "
-                        errMsg += "that you have sufficient write permissions to "
-                        errMsg += "create temporary files and/or directories"
-                        raise SqlmapSystemException(errMsg)
-
-                    warnMsg = "unable to create dump directory "
-                    warnMsg += "'%s' (%s). " % (dumpDbPath, ex)
-                    warnMsg += "Using temporary directory '%s' instead" % tempDir
-                    logger.warn(warnMsg)
-
-                    dumpDbPath = tempDir
+                except:
+                    warnFile = True
+
+                    _ = unicodeencode(re.sub(r"[^\w]", "_", unsafeSQLIdentificatorNaming(db)))
+                    dumpDbPath = os.path.join(conf.dumpPath, "%s-%s" % (_, hashlib.md5(unicodeencode(db)).hexdigest()[:8]))
+
+                    if not os.path.isdir(dumpDbPath):
+                        try:
+                            os.makedirs(dumpDbPath, 0755)
+                        except Exception, ex:
+                            try:
+                                tempDir = tempfile.mkdtemp(prefix="sqlmapdb")
+                            except IOError, _:
+                                errMsg = "unable to write to the temporary directory ('%s'). " % _
+                                errMsg += "Please make sure that your disk is not full and "
+                                errMsg += "that you have sufficient write permissions to "
+                                errMsg += "create temporary files and/or directories"
+                                raise SqlmapSystemException(errMsg)
+
+                            warnMsg = "unable to create dump directory "
+                            warnMsg += "'%s' (%s). " % (dumpDbPath, getSafeExString(ex))
+                            warnMsg += "Using temporary directory '%s' instead" % tempDir
+                            logger.warn(warnMsg)
+
+                            dumpDbPath = tempDir
 
             _ = re.sub(r"[^\w]", "_", normalizeUnicode(unsafeSQLIdentificatorNaming(table)))
             if len(_) < len(table) or IS_WIN and table.upper() in WINDOWS_RESERVED_NAMES:
