Minor update

Author: stamparm

lib/core/common.py

@@ -3450,11 +3450,16 @@ def _(value):
 
  _retVal = [retVal]
  def _thread(regex):
- _retVal[0] = re.sub(r"(?i)%s" % regex, REFLECTED_VALUE_MARKER, _retVal[0])
-
- if len(parts) > 2:
- regex = REFLECTED_REPLACEMENT_REGEX.join(parts[1:])
- _retVal[0] = re.sub(r"(?i)\b%s\b" % regex, REFLECTED_VALUE_MARKER, _retVal[0])
+ try:
+ _retVal[0] = re.sub(r"(?i)%s" % regex, REFLECTED_VALUE_MARKER, _retVal[0])
+
+ if len(parts) > 2:
+ regex = REFLECTED_REPLACEMENT_REGEX.join(parts[1:])
+ _retVal[0] = re.sub(r"(?i)\b%s\b" % regex, REFLECTED_VALUE_MARKER, _retVal[0])
+ except KeyboardInterrupt:
+ raise
+ except:
+ pass
 
  thread = threading.Thread(target=_thread, args=(regex,))
  thread.daemon = True

lib/core/settings.py

@@ -19,7 +19,7 @@
 from lib.core.enums import OS
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.1.4.34"
+VERSION = "1.1.4.35"
 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)

lib/core/threads.py

@@ -87,16 +87,16 @@ def getCurrentThreadName():
 
  return threading.current_thread().getName()
 
-def exceptionHandledFunction(threadFunction):
+def exceptionHandledFunction(threadFunction, silent=False):
  try:
  threadFunction()
  except KeyboardInterrupt:
  kb.threadContinue = False
  kb.threadException = True
  raise
  except Exception, ex:
- # thread is just going to be silently killed
- logger.error("thread %s: %s" % (threading.currentThread().getName(), ex.message))
+ if not silent:
+  logger.error("thread %s: %s" % (threading.currentThread().getName(), ex.message))
 
 def setDaemon(thread):
  # Reference: http://stackoverflow.com/questions/190010/daemon-threads-explanation

txt/checksum.md5

@@ -27,7 +27,7 @@ fc89abe14a48b8232feba692bde992be lib/controller/controller.py
 310efc965c862cfbd7b0da5150a5ad36 lib/controller/__init__.py
 d3b4e1139bf117fe4cf6451d43d8253c lib/core/agent.py
 6cc95a117fbd34ef31b9aa25520f0e31 lib/core/bigarray.py
-1ec36b759f46d8ccb1f4e1434d86b115 lib/core/common.py
+dd39007e2dd0da81c712995a16775d0f lib/core/common.py
 5065a4242a8cccf72f91e22e1007ae63 lib/core/convert.py
 a8143dab9d3a27490f7d49b6b29ea530 lib/core/data.py
 7936d78b1a7f1f008ff92bf2f88574ba lib/core/datatype.py
@@ -46,12 +46,12 @@ ede9841e7cbbe841f41588f149e85789 lib/core/option.py
 d8e9250f3775119df07e9070eddccd16 lib/core/replication.py
 785f86e3f963fa3798f84286a4e83ff2 lib/core/revision.py
 40c80b28b3a5819b737a5a17d4565ae9 lib/core/session.py
-95062a1d8876adc28b63bb987f6c0c57 lib/core/settings.py
+60546a5ba1d6021b0216ec756df4192c lib/core/settings.py
 d91291997d2bd2f6028aaf371bf1d3b6 lib/core/shell.py
 2ad85c130cc5f2b3701ea85c2f6bbf20 lib/core/subprocessng.py
 92e35ddfdf0e9676dd51565bcf4fa5cf lib/core/target.py
 8970b88627902239d695280b1160e16c lib/core/testing.py
-52f2ec61f7df0c4f66452ad14b4ee525 lib/core/threads.py
+40881e63d516d8304fc19971049cded0 lib/core/threads.py
 ad74fc58fc7214802fd27067bce18dd2 lib/core/unescaper.py
 1f1fa616b5b19308d78c610ec8046399 lib/core/update.py
 4d13ed693401a498b6d073a2a494bd83 lib/core/wordlist.py