Abracadabra #2790

sqlmapproject · Jan 12, 2018 · f6738ad · f6738ad
1 parent e0dee94
commit f6738ad
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/lib/core/settings.py b/lib/core/settings.py
@@ -19,7 +19,7 @@
 from lib.core.enums import OS
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.2.1.6"
+VERSION = "1.2.1.7"
 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/thirdparty/colorama/ansitowin32.py b/thirdparty/colorama/ansitowin32.py
@@ -171,9 +171,19 @@ def write_and_convert(self, text):
 
     def write_plain_text(self, text, start, end):
         if start < end:
-            self.wrapped.write(text[start:end])
+            self._write(text[start:end])
             self.wrapped.flush()
 
+    # Reference: https://github.com/robotframework/robotframework/commit/828c67695d85519e4435c556c43ed1b00985df05
+    #  Workaround for Windows 10 console bug:
+    #  https://github.com/robotframework/robotframework/issues/2709
+    def _write(self, text, retry=5):
+        try:
+            self.wrapped.write(text)
+        except IOError, err:
+            if not (err.errno == 0 and retry > 0):
+                raise
+            self._write(text, retry-1)
 
     def convert_ansi(self, paramstring, command):
         if self.convert:

diff --git a/txt/checksum.md5 b/txt/checksum.md5
@@ -46,7 +46,7 @@ ffa5f01f39b17c8d73423acca6cfe86a  lib/core/readlineng.py
 0c3eef46bdbf87e29a3f95f90240d192  lib/core/replication.py
 a7db43859b61569b601b97f187dd31c5  lib/core/revision.py
 fcb74fcc9577523524659ec49e2e964b  lib/core/session.py
-a7506d334169334f86955e6016e2b6ab  lib/core/settings.py
+f0a078744355f8eba214f960c810cdf9  lib/core/settings.py
 d0adc28a38e43a787df4471f7f027413  lib/core/shell.py
 63491be462c515a1a3880c27c2acc4a2  lib/core/subprocessng.py
 505aaa61e1bba3c3d4567c3e667699e3  lib/core/target.py
@@ -328,7 +328,7 @@ bcae4c645a737d3f0e7c96a66528ca4a  thirdparty/chardet/universaldetector.py
 658da0466b798cc70f48f35fe49b7813  thirdparty/clientform/clientform.py
 722281d87fb13ec22555480f8f4c715b  thirdparty/clientform/__init__.py
 0b625ccefa6b066f79d3cbb3639267e6  thirdparty/colorama/ansi.py
-e52252bb81ce1a14b7245b53af33e75f  thirdparty/colorama/ansitowin32.py
+93bb7f06c8300a91b533ea55e8aead43  thirdparty/colorama/ansitowin32.py
 ed4d76c08741d34ac79f6488663345f7  thirdparty/colorama/initialise.py
 c0707ca77ccb4a2c0f12b4085057193c  thirdparty/colorama/__init__.py
 ad3d022d4591aee80f7391248d722413  thirdparty/colorama/win32.py