Merge branch 'master' of github.com:sqlmapproject/sqlmap

bdamele · bdamele · commit 32c8c67888f6 · 2013-02-15T09:29:41.000Z
diff --git a/lib/request/redirecthandler.py b/lib/request/redirecthandler.py
@@ -90,13 +90,13 @@ def http_error_302(self, req, fp, code, msg, headers):
         redirectMsg += "[#%d] (%d %s):\n" % (threadData.lastRequestUID, code, getUnicode(msg))
 
         if headers:
-            logHeaders = "\n".join("%s: %s" % (key.capitalize() if isinstance(key, basestring) else key, getUnicode(value)) for (key, value) in headers.items())
+            logHeaders = "\n".join("%s: %s" % (getUnicode(key.capitalize() if isinstance(key, basestring) else key), getUnicode(value)) for (key, value) in headers.items())
         else:
             logHeaders = ""
 
         redirectMsg += logHeaders
         if content:
-            redirectMsg += "\n\n%s" % content[:MAX_CONNECTION_CHUNK_SIZE]
+            redirectMsg += "\n\n%s" % getUnicode(content[:MAX_CONNECTION_CHUNK_SIZE])
 
         logHTTPTraffic(threadData.lastRequestMsg, redirectMsg)
         logger.log(CUSTOM_LOGGING.TRAFFIC_IN, redirectMsg)
diff --git a/plugins/dbms/mssqlserver/takeover.py b/plugins/dbms/mssqlserver/takeover.py
@@ -57,7 +57,7 @@ def spHeapOverflow(self):
 
                 break
 
-        if addrs is None:
+        if not addrs:
             errMsg = "sqlmap can not exploit the stored procedure buffer "
             errMsg += "overflow because it does not have a valid return "
             errMsg += "code for the underlying operating system (Windows "
