From 725c3a6a95a1fb49d92be6ccaf74d135f66dc91c Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Tue, 28 Oct 2014 14:08:06 +0100
Subject: [PATCH] Minor update

---
 lib/core/common.py | 13 ++++++-------
 sqlmap.py          |  7 +++++++
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/lib/core/common.py b/lib/core/common.py
index 87b7da4bf..0249f69d0 100755
--- a/lib/core/common.py
+++ b/lib/core/common.py
@@ -2855,16 +2855,15 @@ def createGithubIssue(errMsg, excMsg):
     msg = "\ndo you want to automatically create a new (anonymized) issue "
     msg += "with the unhandled exception information at "
     msg += "the official Github repository? [y/N] "
-    test = readInput(msg, default="N")
-    if test[0] in ("y", "Y"):
+    try:
+        test = readInput(msg, default="N")
+    except:
+        test = None
+
+    if test and test[0] in ("y", "Y"):
         ex = None
         errMsg = errMsg[errMsg.find("\n"):]
 
-        for match in re.finditer(r'File "(.+?)", line', excMsg):
-            file = match.group(1).replace('\\', "/")
-            file = file[file.find("sqlmap"):].replace("sqlmap/", "", 1)
-            excMsg = excMsg.replace(match.group(1), file)
-
         data = {"title": "Unhandled exception (#%s)" % hashlib.md5(excMsg).hexdigest()[:8], "body": "```%s\n```\n```\n%s```" % (errMsg, excMsg)}
         req = urllib2.Request(url="https://api.github.com/repos/sqlmapproject/sqlmap/issues", data=json.dumps(data), headers={"Authorization": "token %s" % GITHUB_REPORT_OAUTH_TOKEN})
 
diff --git a/sqlmap.py b/sqlmap.py
index 87035781a..066c7709a 100755
--- a/sqlmap.py
+++ b/sqlmap.py
@@ -9,6 +9,7 @@ import bdb
 import inspect
 import logging
 import os
+import re
 import sys
 import time
 import traceback
@@ -129,6 +130,12 @@ def main():
         print
         errMsg = unhandledExceptionMessage()
         excMsg = traceback.format_exc()
+
+        for match in re.finditer(r'File "(.+?)", line', excMsg):
+            file = match.group(1).replace('\\', "/")
+            file = file[file.find("sqlmap"):].replace("sqlmap/", "", 1)
+            excMsg = excMsg.replace(match.group(1), file)
+
         logger.critical(errMsg)
         kb.stickyLevel = logging.CRITICAL
         dataToStdout(excMsg)