Merge pull request #623 from learn-more/various_fixes

Various fixes

Author: xwings

qiling/core.py

@@ -206,6 +206,14 @@ def __init__(
         # Add extra guard options when configured to do so
         self._init_stop_guard()
 
+        ###############################
+        # Properties configured later #
+        ###############################
+        self.entry_point = None
+        self.exit_point = None
+        self.timeout = None
+        self.count = None
+        self._initial_sp = None
 
     #####################
     # Qiling Components #

qiling/loader/pe.py

@@ -67,8 +67,9 @@ def load_dll(self, dll_name, driver=False):
 
         if self.libcache and os.path.exists(fcache) and \
             os.stat(fcache).st_mtime > os.stat(path).st_mtime: # pickle file cannot be outdated
-            (data, cmdlines, self.import_symbols, self.import_address_table) = \
-                pickle.load(open(fcache, "rb"))
+            with open(fcache, "rb") as fcache_file:
+                (data, cmdlines, self.import_symbols, self.import_address_table) = \
+                    pickle.load(fcache_file)
             for entry in cmdlines:
                 self.set_cmdline(entry['name'], entry['address'], data)
         else:

qiling/os/utils.py

@@ -256,7 +256,11 @@ def disassembler(self, ql, address, size):
             temp_str += ("%02x " % i)
         log_data += temp_str.ljust(30)
 
+        first = True
         for i in insn:
+            if not first:
+                log_data += '\n> '
+            first = False
             log_data += "%s %s" % (i.mnemonic, i.op_str)
         logging.info(log_data)
 

qiling/utils.py

@@ -254,10 +254,11 @@ def debugger_convert_str(debugger_id):
 # Call `function_name` in `module_name`.
 # e.g. map_syscall in qiling.os.linux.map_syscall
 def ql_get_module_function(module_name, function_name = None):
+    
     try:
         imp_module = importlib.import_module(module_name)
-    except:
-        raise QlErrorModuleNotFound("[!] Unable to import module %s" % module_name)
+    except Exception as ex:
+        raise QlErrorModuleNotFound("[!] Unable to import module %s (%s)" % (module_name, ex))
 
     try:
         module_function = getattr(imp_module, function_name)