minor update regarding mnemonics

stamparm · stamparm · commit 17e4c6b564f5 · 2011-06-16T12:26:50.000Z
diff --git a/lib/core/common.py b/lib/core/common.py
@@ -2653,7 +2653,7 @@ def __init__(self):
 
         if pointer in (None, head):
             errMsg = "mnemonic '%s' can't be resolved to any parameter name" % name
-            logger.error(errMsg)
+            raise sqlmapSyntaxException, errMsg
         elif len(pointer.current) > 1:
             options = {}
             for option in pointer.current:
@@ -2678,5 +2678,8 @@ def __init__(self):
             value = found.convert_value(found, value)
             if value is not None:
                 setattr(args, found.dest, value)
-            else:
+            elif not found.type: # boolean
                 setattr(args, found.dest, True)
+            else:
+                errMsg = "mnemonic '%s' requires value of type '%s'" % (name, found.type)
+                raise sqlmapSyntaxException, errMsg
diff --git a/sqlmap.py b/sqlmap.py
@@ -63,17 +63,17 @@ def main():
     Main function of sqlmap when running from command line.
     """
 
-    paths.SQLMAP_ROOT_PATH = modulePath()
-    setPaths()
-    banner()
+    try:
+        paths.SQLMAP_ROOT_PATH = modulePath()
+        setPaths()
+        banner()
 
-    # Store original command line options for possible later restoration
-    cmdLineOptions.update(cmdLineParser().__dict__)
+        # Store original command line options for possible later restoration
+        cmdLineOptions.update(cmdLineParser().__dict__)
 
-    dataToStdout("[!] legal disclaimer: %s\n\n" % LEGAL_DISCLAIMER, forceOutput=True)
-    dataToStdout("[*] starting at %s\n\n" % time.strftime("%X"), forceOutput=True)
+        dataToStdout("[!] legal disclaimer: %s\n\n" % LEGAL_DISCLAIMER, forceOutput=True)
+        dataToStdout("[*] starting at %s\n\n" % time.strftime("%X"), forceOutput=True)
 
-    try:
         init(cmdLineOptions)
         if conf.profile:
             profile()
