Minor patch

Author: stamparm

lib/core/settings.py

@@ -20,7 +20,7 @@
 from thirdparty import six
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.10.8.4"
+VERSION = "1.10.8.5"
 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)

plugins/dbms/mssqlserver/syntax.py

@@ -16,9 +16,22 @@ def escape(expression, quote=True):
         True
         >>> Syntax.escape(u"SELECT 'abcd\xebfgh' FROM foobar") == "SELECT CHAR(97)+CHAR(98)+CHAR(99)+CHAR(100)+NCHAR(235)+CHAR(102)+CHAR(103)+CHAR(104) FROM foobar"
         True
+        >>> Syntax.escape(u"SELECT '\U0001f600' FROM foobar") == "SELECT NCHAR(55357)+NCHAR(56832) FROM foobar"
+        True
         """
 
         def escaper(value):
-            return "+".join("%s(%d)" % ("CHAR" if _ < 128 else "NCHAR", _) for _ in getOrds(value))
+            chars = []
+
+            for _ in getOrds(value):
+                if _ < 128:
+                    chars.append("CHAR(%d)" % _)
+                elif _ < 0x10000:
+                    chars.append("NCHAR(%d)" % _)
+                else:
+                    _ -= 0x10000
+                    chars.append("NCHAR(%d)+NCHAR(%d)" % (0xd800 + (_ >> 10), 0xdc00 + (_ & 0x3ff)))  # SQL Server's NCHAR() only accepts BMP values without SC collation, so split into a surrogate pair
+
+            return "+".join(chars)
 
         return Syntax._escape(expression, quote, escaper)