fix bug: uninitialize variables in pcs-console

knownsec · Mar 15, 2016 · dec567a · dec567a
1 parent cca4a6d
commit dec567a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/pocsuite/lib/controller/setpoc.py b/pocsuite/lib/controller/setpoc.py
@@ -57,8 +57,11 @@ def loadPoc(pocFile):
     if conf.isPocString:
         poc = conf.pocFile
         if not conf.pocname:
-            errMsg = "Use pocString must provide pocname"
-            logger.log(CUSTOM_LOGGING.ERROR, errMsg)
+            if conf.pocFile:
+                conf.pocname = os.path.split(conf.pocFile)[1]
+            else:
+                errMsg = "Use pocString must provide pocname"
+                logger.log(CUSTOM_LOGGING.ERROR, errMsg)
         pocname = conf.pocname
     else:
         pocname = os.path.split(pocFile)[1]

diff --git a/pocsuite/lib/core/consoles.py b/pocsuite/lib/core/consoles.py
@@ -77,10 +77,15 @@ def __init__(self):
             coloramainit()
         Cmd.__init__(self)
         os.system("clear")
+
+        conf.report = False
+        conf.retry = False
+        conf.delay = 0
         conf.quiet = False
-        banner()
-        self.case_insensitive = False
-        self.prompt = "Pcs> "
+        conf.isPocString = False
+        conf.isPycFile = False
+        conf.requires = False
+        conf.requiresFreeze = False
 
         conf.url = None
         conf.proxy = None
@@ -96,6 +101,10 @@ def __init__(self):
         conf.timeout = 5
         conf.httpHeaders = HTTP_DEFAULT_HEADER
 
+        self.prompt = "Pcs> "
+        banner()
+        self.case_insensitive = False
+
     def do_verify(self, args):
         conf.mode = 'verify'
         self._execute()
@@ -298,6 +307,7 @@ def do_load(self, args):
         else:
             conf.pocFile = args
 
+        conf.pocname = os.path.split(conf.pocFile)[1]
         setPoc()
 
         print '[*] load poc file(s) success!'

diff --git a/pocsuite/lib/core/settings.py b/pocsuite/lib/core/settings.py
@@ -93,7 +93,9 @@
     'proxy': None,
     'proxyCred': None,
     'timeout': 5,
-    'quiet': False
+    'quiet': False,
+    'requires': False,
+    'requiresFreeze': False
 }
 
 REPORT_TABLEBASE = """\