Patch for #3671

stamparm · stamparm · commit 0a67f0f57c24 · 2019-05-16T12:15:51.000+02:00
diff --git a/lib/core/settings.py b/lib/core/settings.py
@@ -18,7 +18,7 @@
 from thirdparty.six import unichr as _unichr
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.3.5.96"
+VERSION = "1.3.5.97"
 TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
 TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
 VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)
diff --git a/lib/core/shell.py b/lib/core/shell.py
@@ -14,6 +14,7 @@
 from lib.core.data import paths
 from lib.core.enums import AUTOCOMPLETE_TYPE
 from lib.core.enums import OS
+from lib.core.settings import IS_WIN
 from lib.core.settings import MAX_HISTORY_LENGTH
 
 try:
@@ -103,6 +104,11 @@ def loadHistory(completion=None):
         except IOError as ex:
             warnMsg = "there was a problem loading the history file '%s' (%s)" % (historyPath, getSafeExString(ex))
             logger.warn(warnMsg)
+        except UnicodeError:
+            if IS_WIN:
+                warnMsg = "there was a problem loading the history file '%s'. " % historyPath
+                warnMsg += "More info can be found at 'https://github.com/pyreadline/pyreadline/issues/30'"
+                logger.warn(warnMsg)
 
 def autoCompletion(completion=None, os=None, commands=None):
     if not readlineAvailable():
