Bug fix for boolean (multithreaded Ctrl+C) resumed values

stamparm · stamparm · commit f4b8a3c1d8ea · 2013-02-04T15:49:29.000+01:00
diff --git a/lib/core/settings.py b/lib/core/settings.py
@@ -43,7 +43,7 @@
 
 PAYLOAD_DELIMITER = "\x00"
 CHAR_INFERENCE_MARK = "%c"
-PRINTABLE_CHAR_REGEX = r"[^\x00-\x1f\x7e-\xff]"
+PRINTABLE_CHAR_REGEX = r"[^\x00-\x1f\x7f-\xff]"
 
 # Regular expression used for recognition of generic permission messages
 PERMISSION_DENIED_REGEX = r"(command|permission|access)\s*(was|is)?\s*denied"
diff --git a/lib/techniques/blind/inference.py b/lib/techniques/blind/inference.py
@@ -444,7 +444,8 @@ def blindThread():
                 abortedFlag = True
 
             finally:
-                value = [partialValue[_] if _ < len(partialValue) else threadData.shared.value[_] for _ in xrange(length)]
+                value = [_ for _ in partialValue]
+                value.extend(_ for _ in threadData.shared.value)
 
             infoMsg = None
 
