Fixes #4081

stamparm · stamparm · commit 984808cc2614 · 2020-01-23T11:55:41.000+01: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.4.1.40"
+VERSION = "1.4.1.41"
 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/request/dns.py b/lib/request/dns.py
@@ -19,23 +19,28 @@ class DNSQuery(object):
     """
     >>> DNSQuery(b'|K\\x01 \\x00\\x01\\x00\\x00\\x00\\x00\\x00\\x01\\x03www\\x06google\\x03com\\x00\\x00\\x01\\x00\\x01\\x00\\x00)\\x10\\x00\\x00\\x00\\x00\\x00\\x00\\x0c\\x00\\n\\x00\\x08O4|Np!\\x1d\\xb3')._query == b"www.google.com."
     True
+    >>> DNSQuery(b'\\x00')._query == b""
+    True
     """
 
     def __init__(self, raw):
         self._raw = raw
         self._query = b""
 
-        type_ = (ord(raw[2:3]) >> 3) & 15                   # Opcode bits
-
-        if type_ == 0:                                      # Standard query
-            i = 12
-            j = ord(raw[i:i + 1])
+        try:
+            type_ = (ord(raw[2:3]) >> 3) & 15                   # Opcode bits
 
-            while j != 0:
-                self._query += raw[i + 1:i + j + 1] + b'.'
-                i = i + j + 1
+            if type_ == 0:                                      # Standard query
+                i = 12
                 j = ord(raw[i:i + 1])
 
+                while j != 0:
+                    self._query += raw[i + 1:i + j + 1] + b'.'
+                    i = i + j + 1
+                    j = ord(raw[i:i + 1])
+        except TypeError:
+            pass
+
     def response(self, resolution):
         """
         Crafts raw DNS resolution response packet
