From 4d5b48b2ae3bb2b8c37fc246719fb65b87a62fd9 Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Tue, 4 Nov 2014 00:34:35 +0100
Subject: [PATCH] Patch for an Issue #896

---
 lib/core/common.py   | 32 +++++++++++++-------------------
 lib/core/testing.py  |  2 +-
 lib/parse/cmdline.py |  6 +++---
 3 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/lib/core/common.py b/lib/core/common.py
index 166ecb3ce..c00793778 100755
--- a/lib/core/common.py
+++ b/lib/core/common.py
@@ -923,7 +923,7 @@ def readInput(message, default=None, checkBatch=True):
 
             try:
                 retVal = raw_input() or default
-                retVal = getUnicode(retVal, system=True) if retVal else retVal
+                retVal = getUnicode(retVal, encoding=sys.stdin.encoding) if retVal else retVal
             except:
                 time.sleep(0.05)  # Reference: http://www.gossamer-threads.com/lists/python/python/781893
                 kb.prependFlag = True
@@ -1064,7 +1064,7 @@ def setPaths():
     paths.SQLMAP_XML_BANNER_PATH = os.path.join(paths.SQLMAP_XML_PATH, "banner")
 
     _ = os.path.join(os.path.expanduser("~"), ".sqlmap")
-    paths.SQLMAP_OUTPUT_PATH = getUnicode(paths.get("SQLMAP_OUTPUT_PATH", os.path.join(_, "output")), system=True)
+    paths.SQLMAP_OUTPUT_PATH = getUnicode(paths.get("SQLMAP_OUTPUT_PATH", os.path.join(_, "output")), encoding=sys.getfilesystemencoding())
     paths.SQLMAP_DUMP_PATH = os.path.join(paths.SQLMAP_OUTPUT_PATH, "%s", "dump")
     paths.SQLMAP_FILES_PATH = os.path.join(paths.SQLMAP_OUTPUT_PATH, "%s", "files")
 
@@ -2009,7 +2009,7 @@ def getPartRun(alias=True):
     else:
         return retVal
 
-def getUnicode(value, encoding=None, system=False, noneToNull=False):
+def getUnicode(value, encoding=None, noneToNull=False):
     """
     Return the unicode representation of the supplied value:
 
@@ -2028,25 +2028,19 @@ def getUnicode(value, encoding=None, system=False, noneToNull=False):
         value = list(getUnicode(_, encoding, system, noneToNull) for _ in value)
         return value
 
-    if not system:
-        if isinstance(value, unicode):
-            return value
-        elif isinstance(value, basestring):
-            while True:
-                try:
-                    return unicode(value, encoding or kb.get("pageEncoding") or UNICODE_ENCODING)
-                except UnicodeDecodeError, ex:
-                    value = value[:ex.start] + "".join(INVALID_UNICODE_CHAR_FORMAT % ord(_) for _ in value[ex.start:ex.end]) + value[ex.end:]
-        else:
+    if isinstance(value, unicode):
+        return value
+    elif isinstance(value, basestring):
+        while True:
             try:
-                return unicode(value)
-            except UnicodeDecodeError:
-                return unicode(str(value), errors="ignore")  # encoding ignored for non-basestring instances
+                return unicode(value, encoding or kb.get("pageEncoding") or UNICODE_ENCODING)
+            except UnicodeDecodeError, ex:
+                value = value[:ex.start] + "".join(INVALID_UNICODE_CHAR_FORMAT % ord(_) for _ in value[ex.start:ex.end]) + value[ex.end:]
     else:
         try:
-            return getUnicode(value, sys.getfilesystemencoding() or sys.stdin.encoding)
-        except:
-            return getUnicode(value, UNICODE_ENCODING)
+            return unicode(value)
+        except UnicodeDecodeError:
+            return unicode(str(value), errors="ignore")  # encoding ignored for non-basestring instances
 
 def longestCommonPrefix(*sequences):
     """
diff --git a/lib/core/testing.py b/lib/core/testing.py
index c2c96de0a..bc72de58c 100644
--- a/lib/core/testing.py
+++ b/lib/core/testing.py
@@ -285,7 +285,7 @@ def runCase(parse):
     elif result is False:  # this means no SQL injection has been detected - if None, ignore
         retVal = False
 
-    console = getUnicode(console, system=True)
+    console = getUnicode(console, encoding=sys.stdin.encoding)
 
     if parse and retVal:
         with codecs.open(conf.dumper.getOutputFile(), "rb", UNICODE_ENCODING) as f:
diff --git a/lib/parse/cmdline.py b/lib/parse/cmdline.py
index 0bfbbba77..a3cbfe582 100644
--- a/lib/parse/cmdline.py
+++ b/lib/parse/cmdline.py
@@ -41,7 +41,7 @@ def cmdLineParser():
 
     checkSystemEncoding()
 
-    _ = getUnicode(os.path.normpath(sys.argv[0]), system=True)
+    _ = getUnicode(os.path.normpath(sys.argv[0]), encoding=sys.getfilesystemencoding())
 
     usage = "%s%s [options]" % ("python " if not IS_WIN else "", \
             "\"%s\"" % _ if " " in _ else _)
@@ -788,7 +788,7 @@ def cmdLineParser():
         advancedHelp = True
 
         for arg in sys.argv:
-            argv.append(getUnicode(arg, system=True))
+            argv.append(getUnicode(arg, encoding=sys.stdin.encoding))
 
         checkDeprecatedOptions(argv)
 
@@ -837,7 +837,7 @@ def cmdLineParser():
                     break
 
             for arg in shlex.split(command):
-                argv.append(getUnicode(arg, system=True))
+                argv.append(getUnicode(arg, encoding=sys.stdin.encoding))
 
         # Hide non-basic options in basic help case
         for i in xrange(len(argv)):